CVS commit: src/sys/rump/dev/lib/libumass
Module Name:src
Committed By: pooka
Date: Sat Jun 13 23:33:20 UTC 2015
Modified Files:
src/sys/rump/dev/lib/libumass: Makefile
Log Message:
fix snafu to enable umass component also for amd64
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/dev/lib/libumass/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/dev/lib/libumass/Makefile
diff -u src/sys/rump/dev/lib/libumass/Makefile:1.7 src/sys/rump/dev/lib/libumass/Makefile:1.8
--- src/sys/rump/dev/lib/libumass/Makefile:1.7 Thu Mar 13 01:54:59 2014
+++ src/sys/rump/dev/lib/libumass/Makefile Sat Jun 13 23:33:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/13 01:54:59 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/13 23:33:20 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/usb
@@ -6,7 +6,7 @@
LIB= rumpdev_umass
IOCONF= UMASS.ioconf
-.if ${MACHINE} == i386
+.if ${MACHINE} == i386 || ${MACHINE} == amd64
SRCS= umass.c umass_isdata.c umass_quirks.c umass_scsipi.c
SRCS+= umass_component.c
CVS commit: src/sys/arch/amiga/include
Module Name:src
Committed By: phx
Date: Sat Jun 13 23:55:18 UTC 2015
Modified Files:
src/sys/arch/amiga/include: vmparam.h
Log Message:
Use all the changes from
http://ftp.netbsd.org/pub/NetBSD/misc/mlelstv/vmparam.diff
after a discussion on port-m68k. I tested them on several Amiga models
and they seem to work fine.
This gives us the maximum virtual memory space for a process under the
current 512MB pmap limitation.
Also bump VM_KERNEL_PT_PAGES to allow up to 2 GB RAM.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amiga/include/vmparam.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/include/vmparam.h
diff -u src/sys/arch/amiga/include/vmparam.h:1.43 src/sys/arch/amiga/include/vmparam.h:1.44
--- src/sys/arch/amiga/include/vmparam.h:1.43 Mon Jun 1 17:16:56 2015
+++ src/sys/arch/amiga/include/vmparam.h Sat Jun 13 23:55:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.43 2015/06/01 17:16:56 phx Exp $ */
+/* $NetBSD: vmparam.h,v 1.44 2015/06/13 23:55:18 phx Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -70,13 +70,13 @@
*/
#ifndef MAXTSIZ
-#define MAXTSIZ (16*1024*1024) /* max text size */
+#define MAXTSIZ (32*1024*1024) /* max text size */
#endif
#ifndef DFLDSIZ
-#define DFLDSIZ (32*1024*1024) /* initial data size limit */
+#define DFLDSIZ (64*1024*1024) /* initial data size limit */
#endif
#ifndef MAXDSIZ
-#define MAXDSIZ (256*1024*1024) /* max data size */
+#define MAXDSIZ (416*1024*1024) /* max data size */
#endif
#ifndef DFLSSIZ
#define DFLSSIZ (2*1024*1024) /* initial stack size limit */
@@ -138,5 +138,5 @@ struct pmap_physseg {
/*
* number of kernel PT pages (initial only, can grow dynamically)
*/
-#define VM_KERNEL_PT_PAGES ((vm_size_t)8) /* XXX: SYSPTSIZE */
+#define VM_KERNEL_PT_PAGES ((vm_size_t)10) /* XXX: SYSPTSIZE */
#endif /* !_MACHINE_VMPARAM_H_ */
CVS commit: src/sys/ufs/ufs
Module Name:src
Committed By: hannken
Date: Sat Jun 13 14:56:45 UTC 2015
Modified Files:
src/sys/ufs/ufs: ufs_inode.c
Log Message:
ufs_inactive: stop overwriting error status and return the last error seen.
Should resolve CID 1306276 (UNUSED_VALUE)
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/ufs/ufs/ufs_inode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ufs/ufs_inode.c
diff -u src/sys/ufs/ufs/ufs_inode.c:1.94 src/sys/ufs/ufs/ufs_inode.c:1.95
--- src/sys/ufs/ufs/ufs_inode.c:1.94 Wed Jun 10 15:28:27 2015
+++ src/sys/ufs/ufs/ufs_inode.c Sat Jun 13 14:56:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_inode.c,v 1.94 2015/06/10 15:28:27 hannken Exp $ */
+/* $NetBSD: ufs_inode.c,v 1.95 2015/06/13 14:56:45 hannken Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_inode.c,v 1.94 2015/06/10 15:28:27 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_inode.c,v 1.95 2015/06/13 14:56:45 hannken Exp $);
#if defined(_KERNEL_OPT)
#include opt_ffs.h
@@ -86,7 +86,7 @@ ufs_inactive(void *v)
struct inode *ip = VTOI(vp);
struct mount *mp = vp-v_mount;
mode_t mode;
- int error = 0;
+ int allerror = 0, error;
bool wapbl_locked = false;
UFS_WAPBL_JUNLOCK_ASSERT(mp);
@@ -102,10 +102,12 @@ ufs_inactive(void *v)
ufs_extattr_vnode_inactive(vp, curlwp);
#endif
if (ip-i_size != 0)
- error = ufs_truncate(vp, 0, NOCRED);
+ allerror = ufs_truncate(vp, 0, NOCRED);
#if defined(QUOTA) || defined(QUOTA2)
error = UFS_WAPBL_BEGIN(mp);
- if (error == 0) {
+ if (error) {
+ allerror = error;
+ } else {
wapbl_locked = true;
(void)chkiq(ip, -1, NOCRED, 0);
}
@@ -124,8 +126,10 @@ ufs_inactive(void *v)
if (ip-i_flag (IN_CHANGE | IN_UPDATE | IN_MODIFIED)) {
if (! wapbl_locked) {
error = UFS_WAPBL_BEGIN(mp);
- if (error)
+ if (error) {
+allerror = error;
goto out;
+ }
wapbl_locked = true;
}
UFS_UPDATE(vp, NULL, NULL, 0);
@@ -140,7 +144,7 @@ out:
*ap-a_recycle = (ip-i_mode == 0);
VOP_UNLOCK(vp);
fstrans_done(mp);
- return (error);
+ return (allerror);
}
/*
CVS commit: src/sys/arch/amiga/amiga
Module Name:src Committed By: mlelstv Date: Sat Jun 13 07:35:50 UTC 2015 Modified Files: src/sys/arch/amiga/amiga: machdep.c Log Message: btoc is already rounding up to click size, use predefined ctod macro to translate to disk blocks. To generate a diff of this commit: cvs rdiff -u -r1.244 -r1.245 src/sys/arch/amiga/amiga/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amiga/amiga/machdep.c diff -u src/sys/arch/amiga/amiga/machdep.c:1.244 src/sys/arch/amiga/amiga/machdep.c:1.245 --- src/sys/arch/amiga/amiga/machdep.c:1.244 Sun Jun 7 20:00:11 2015 +++ src/sys/arch/amiga/amiga/machdep.c Sat Jun 13 07:35:50 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.244 2015/06/07 20:00:11 mlelstv Exp $ */ +/* $NetBSD: machdep.c,v 1.245 2015/06/13 07:35:50 mlelstv Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -50,7 +50,7 @@ #include empm.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.244 2015/06/07 20:00:11 mlelstv Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.245 2015/06/13 07:35:50 mlelstv Exp $); #include sys/param.h #include sys/systm.h @@ -535,7 +535,7 @@ cpu_dumpconf(void) else if (dumplo == 0) dumplo = nblks - btodb(ctob(dumpsize)); } - dumplo -= btodb(ctob(btoc(MDHDRSIZE + ctob(1) - 1))); + dumplo -= ctod(btoc(MDHDRSIZE)); /* * Don't dump on the first PAGE_SIZE (why PAGE_SIZE?) * in case the dump device includes a disk label.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Sat Jun 13 15:47:58 UTC 2015
Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h
Log Message:
Add MSI/MSI-X support written by Kengo Nakahara. Some old devices' support
is written by me. It's disabled by default. If you'd like to use, define
WM_MSI_MSIX.
Tested with:
8254[3405617] (INTx even if it has MSI CAP because of a errata)
8257[12], 82583 ICH8, ICH10, PCH2, PCH_LPT(I21[78]) (MSI)
8257[456], 82580, I35[04], I21[01] (MSI-X)
Not tested:
82542, 82573, 80003, ICH9, PCH,
To generate a diff of this commit:
cvs rdiff -u -r1.334 -r1.335 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/if_wmreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.334 src/sys/dev/pci/if_wm.c:1.335
--- src/sys/dev/pci/if_wm.c:1.334 Fri Jun 12 04:40:28 2015
+++ src/sys/dev/pci/if_wm.c Sat Jun 13 15:47:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.334 2015/06/12 04:40:28 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.335 2015/06/13 15:47:58 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.334 2015/06/12 04:40:28 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.335 2015/06/13 15:47:58 msaitoh Exp $);
#ifdef _KERNEL_OPT
#include opt_net_mpsafe.h
@@ -154,6 +154,31 @@ int wm_debug = WM_DEBUG_TX | WM_DEBUG_RX
#define WM_MPSAFE 1
#endif
+#ifdef __HAVE_PCI_MSI_MSIX
+#if 0 /* off by default */
+#define WM_MSI_MSIX 1
+#endif
+#endif
+
+/*
+ * This device driver divides interrupt to TX, RX and link state.
+ * Each MSI-X vector indexes are below.
+ */
+#define WM_NINTR 3
+#define WM_TX_INTR_INDEX 0
+#define WM_RX_INTR_INDEX 1
+#define WM_LINK_INTR_INDEX 2
+#define WM_MAX_NINTR WM_NINTR
+
+/*
+ * This device driver set affinity to each interrupts like below (round-robin).
+ * If the number CPUs is less than the number of interrupts, this driver usase
+ * the same CPU for multiple interrupts.
+ */
+#define WM_TX_INTR_CPUID 0
+#define WM_RX_INTR_CPUID 1
+#define WM_LINK_INTR_CPUID 2
+
/*
* Transmit descriptor list size. Due to errata, we can only have
* 256 hardware descriptors in the ring on 82544, but we use 4096
@@ -295,7 +320,13 @@ struct wm_softc {
int sc_flowflags; /* 802.3x flow control flags */
int sc_align_tweak;
- void *sc_ih; /* interrupt cookie */
+ void *sc_ihs[WM_MAX_NINTR]; /*
+ * interrupt cookie.
+ * legacy and msi use sc_ihs[0].
+ */
+ pci_intr_handle_t *sc_intrs; /* legacy and msi use sc_intrs[0] */
+ int sc_nintrs; /* number of interrupts */
+
callout_t sc_tick_ch; /* tick callout */
bool sc_stopping;
@@ -593,13 +624,18 @@ static int wm_nq_tx_offload(struct wm_so
static void wm_nq_start(struct ifnet *);
static void wm_nq_start_locked(struct ifnet *);
/* Interrupt */
-static void wm_txintr(struct wm_softc *);
-static void wm_rxintr(struct wm_softc *);
+static int wm_txeof(struct wm_softc *);
+static void wm_rxeof(struct wm_softc *);
static void wm_linkintr_gmii(struct wm_softc *, uint32_t);
static void wm_linkintr_tbi(struct wm_softc *, uint32_t);
static void wm_linkintr_serdes(struct wm_softc *, uint32_t);
static void wm_linkintr(struct wm_softc *, uint32_t);
-static int wm_intr(void *);
+static int wm_intr_legacy(void *);
+#ifdef WM_MSI_MSIX
+static int wm_txintr_msix(void *);
+static int wm_rxintr_msix(void *);
+static int wm_linkintr_msix(void *);
+#endif
/*
* Media related.
@@ -1368,7 +1404,11 @@ wm_attach(device_t parent, device_t self
prop_dictionary_t dict;
struct ifnet *ifp = sc-sc_ethercom.ec_if;
pci_chipset_tag_t pc = pa-pa_pc;
+#ifndef WM_MSI_MSIX
pci_intr_handle_t ih;
+#else
+ bool intr_established = false;
+#endif
const char *intrstr = NULL;
const char *eetype, *xname;
bus_space_tag_t memt;
@@ -1424,6 +1464,19 @@ wm_attach(device_t parent, device_t self
sc-sc_type = WM_T_82542_2_0;
}
+ /*
+ * Disable MSI for Errata:
+ * Message Signaled Interrupt Feature May Corrupt Write Transactions
+ *
+ * 82544: Errata 25
+ * 82540: Errata 6 (easy to reproduce device timeout)
+ * 82545: Errata 4 (easy to reproduce device timeout)
+ * 82546: Errata 26 (easy to reproduce device timeout)
+ * 82541: Errata 7 (easy to reproduce device timeout)
+ */
+ if (sc-sc_type = WM_T_82541_2)
+ pa-pa_flags = ~PCI_FLAGS_MSI_OKAY;
+
if ((sc-sc_type == WM_T_82575) || (sc-sc_type == WM_T_82576)
|| (sc-sc_type == WM_T_82580)
|| (sc-sc_type == WM_T_I350) || (sc-sc_type == WM_T_I354)
@@ -1517,6 +1570,7 @@ wm_attach(device_t parent, device_t self
return;
}
+#ifndef WM_MSI_MSIX
/*
* Map and establish our interrupt.
*/
@@ -1528,8 +1582,8 @@ wm_attach(device_t parent, device_t self
#ifdef WM_MPSAFE
pci_intr_setattr(pc, ih,
CVS commit: src/lib/libc/gen
Module Name:src Committed By: dennis Date: Sat Jun 13 17:28:42 UTC 2015 Modified Files: src/lib/libc/gen: nlist_private.h Log Message: Add entries for riscv and aarch64. This lets the former build complete and gets the latter close to the end. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/lib/libc/gen/nlist_private.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/nlist_private.h diff -u src/lib/libc/gen/nlist_private.h:1.22 src/lib/libc/gen/nlist_private.h:1.23 --- src/lib/libc/gen/nlist_private.h:1.22 Tue Mar 20 16:36:05 2012 +++ src/lib/libc/gen/nlist_private.h Sat Jun 13 17:28:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: nlist_private.h,v 1.22 2012/03/20 16:36:05 matt Exp $ */ +/* $NetBSD: nlist_private.h,v 1.23 2015/06/13 17:28:42 dennis Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou @@ -62,6 +62,13 @@ # define NLIST_ELF32 #elif defined(__hppa__) # define NLIST_ELF32 +#elif defined(__riscv__) +# define NLIST_ELF32 +# ifdef __riscv64 +#define NLIST_ELF64 +# endif +#elif defined(__aarch64__) +# define NLIST_ELF64 #else # define NLIST_AOUT /* #define NLIST_ECOFF */
CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon
Module Name:src
Committed By: jakllsch
Date: Sat Jun 13 18:18:18 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_bios.c
Log Message:
Fix two issues in NetBSD implementation of igp_read_bios_from_vram():
* Allocate the correct buffer for the VGA BIOS image.
* Abort if buffer allocation failed, not if buffer allocation succeeded.
Not directly tested, but I can't imagine this makes anything worse.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.2 Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c Sat Jun 13 18:18:18 2015
@@ -72,7 +72,7 @@ static bool igp_read_bios_from_vram(stru
(size 256 * 1024) ||
(bus_space_read_1(bst, bsh, 0) != 0x55) ||
(bus_space_read_1(bst, bsh, 1) != 0xaa) ||
- ((rdev = kmalloc(size, GFP_KERNEL)) != NULL)) {
+ ((rdev-bios = kmalloc(size, GFP_KERNEL)) == NULL)) {
bus_space_unmap(bst, bsh, size);
return false;
}
CVS commit: src/lib/libutil
Module Name:src Committed By: dholland Date: Sat Jun 13 19:52:58 UTC 2015 Modified Files: src/lib/libutil: getfsspecname.3 Log Message: grammar patrol To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libutil/getfsspecname.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/getfsspecname.3 diff -u src/lib/libutil/getfsspecname.3:1.4 src/lib/libutil/getfsspecname.3:1.5 --- src/lib/libutil/getfsspecname.3:1.4 Mon Aug 18 07:33:21 2014 +++ src/lib/libutil/getfsspecname.3 Sat Jun 13 19:52:58 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: getfsspecname.3,v 1.4 2014/08/18 07:33:21 christos Exp $ +.\ $NetBSD: getfsspecname.3,v 1.5 2015/06/13 19:52:58 dholland Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -72,7 +72,7 @@ or the original argument. On failure .Dv NULL -is return and +is returned and .Fa buf contains the reason for the error. .Sh SEE ALSO
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: christos Date: Sat Jun 13 22:17:04 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_mod.c Log Message: we need compat_sysv now. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/compat/netbsd32/netbsd32_mod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.5 src/sys/compat/netbsd32/netbsd32_mod.c:1.6 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.5 Tue Jul 22 04:18:33 2014 +++ src/sys/compat/netbsd32/netbsd32_mod.c Sat Jun 13 18:17:04 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.5 2014/07/22 08:18:33 maxv Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.6 2015/06/13 22:17:04 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,13 +30,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_mod.c,v 1.5 2014/07/22 08:18:33 maxv Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_mod.c,v 1.6 2015/06/13 22:17:04 christos Exp $); #ifdef _KERNEL_OPT #include opt_execfmt.h -# define DEPS1 compat +# define DEPS1 compat,compat_sysv #else -# define DEPS1 compat,ksem +# define DEPS1 compat,compat_sysv,ksem #endif #ifndef ELFSIZE
CVS commit: src/sys/modules/compat_sysv
Module Name:src
Committed By: christos
Date: Sat Jun 13 22:18:04 UTC 2015
Modified Files:
src/sys/modules/compat_sysv: Makefile
Log Message:
old ipc still needed for compat_netbsd32 on i386 and sparc.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/compat_sysv/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/compat_sysv/Makefile
diff -u src/sys/modules/compat_sysv/Makefile:1.1 src/sys/modules/compat_sysv/Makefile:1.2
--- src/sys/modules/compat_sysv/Makefile:1.1 Sun May 10 03:41:16 2015
+++ src/sys/modules/compat_sysv/Makefile Sat Jun 13 18:18:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/05/10 07:41:16 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2015/06/13 22:18:04 christos Exp $
.include ../Makefile.inc
@@ -16,9 +16,7 @@ SRCS= compat_sysv_mod.c
SRCS+= sysv_msg_14.c sysv_sem_14.c sysv_shm_14.c
SRCS+= sysv_msg_50.c sysv_sem_50.c sysv_shm_50.c sysv_ipc_50.c
-# really, all machines where sizeof(int) != sizeof(long) (LP64)
-.if (${MACHINE_ARCH} != alpha ${MACHINE_ARCH} != sparc64 \
- ${MACHINE_ARCH} != x86_64)
+.if ${MACHINE_ARCH} != alpha
SRCS+= kern_ipc_10.c
.endif
CVS commit: src/usr.bin/ldd
Module Name:src
Committed By: martin
Date: Sat Jun 13 20:38:52 UTC 2015
Modified Files:
src/usr.bin/ldd: Makefile.inc
Log Message:
Do not set MLIBDIR if MKCOMPAT=no
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/ldd/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ldd/Makefile.inc
diff -u src/usr.bin/ldd/Makefile.inc:1.5 src/usr.bin/ldd/Makefile.inc:1.6
--- src/usr.bin/ldd/Makefile.inc:1.5 Wed Mar 20 15:18:42 2013
+++ src/usr.bin/ldd/Makefile.inc Sat Jun 13 20:38:52 2015
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.5 2013/03/20 15:18:42 macallan Exp $
+# $NetBSD: Makefile.inc,v 1.6 2015/06/13 20:38:52 martin Exp $
WARNS?= 3 # XXX: -Wsign-compare issues ld.elf_so source
+.if ${MKCOMPAT} != no
+
.if ${MACHINE_ARCH} == sparc64
MLIBDIR= sparc
.endif
@@ -21,6 +23,8 @@ COMPAT_MLIBDIR= o32
CPPFLAGS+= -DLDD_ELF64 -DMIPS_N32
.endif
+.endif # MKCOMPAT
+
.if exists(${.CURDIR}/../../Makefile.inc)
.include ${.CURDIR}/../../Makefile.inc
.endif
