Module Name: src
Committed By: snj
Date: Wed Jun 10 17:16:24 UTC 2015
Modified Files:
src/common/lib/libc/arch/arm [netbsd-7]: features.mk
src/lib/libarch [netbsd-7]: Makefile
src/lib/libarch/i386 [netbsd-7]: Makefile.inc
src/lib/libarch/x86_64 [netbsd-7]: Makefile.inc
src/share/mk [netbsd-7]: bsd.gcc.mk bsd.prog.mk
Log Message:
Pull up following revision(s) (requested by martin in ticket #837):
common/lib/libc/arch/arm/features.mk: revision 1.2
lib/libarch/Makefile: revision 1.29
lib/libarch/i386/Makefile.inc: revision 1.15
lib/libarch/x86_64/Makefile.inc: revision 1.5
share/mk/bsd.gcc.mk: revision 1.11
share/mk/bsd.prog.mk: revision 1.292
Make LIBCRT* depend on the right files if MLIBDIR from MKCOMPAT is defined.
Use ${COPT} so it properly emits the right features doing MKCOMPAT
Avoid defining MLIBDIR. Use ${MLIBDIR:Unone} instead.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.6.1 src/common/lib/libc/arch/arm/features.mk
cvs rdiff -u -r1.28 -r1.28.2.1 src/lib/libarch/Makefile
cvs rdiff -u -r1.14 -r1.14.24.1 src/lib/libarch/i386/Makefile.inc
cvs rdiff -u -r1.4 -r1.4.24.1 src/lib/libarch/x86_64/Makefile.inc
cvs rdiff -u -r1.10 -r1.10.8.1 src/share/mk/bsd.gcc.mk
cvs rdiff -u -r1.290 -r1.290.4.1 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/features.mk
diff -u src/common/lib/libc/arch/arm/features.mk:1.1 src/common/lib/libc/arch/arm/features.mk:1.1.6.1
--- src/common/lib/libc/arch/arm/features.mk:1.1 Thu Feb 27 09:37:02 2014
+++ src/common/lib/libc/arch/arm/features.mk Wed Jun 10 17:16:23 2015
@@ -1,9 +1,9 @@
-# $NetBSD: features.mk,v 1.1 2014/02/27 09:37:02 matt Exp $
+# $NetBSD: features.mk,v 1.1.6.1 2015/06/10 17:16:23 snj Exp $
.ifnmake obj
TESTFILE=${NETBSDSRCDIR}/common/lib/libc/arch/arm/features.c
-FEAT_EABI!=if ${COMPILE.c} -fsyntax-only -DEABI_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
-FEAT_LDREX!=if ${COMPILE.c} -fsyntax-only -DLDREX_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
-FEAT_LDRD!=if ${COMPILE.c} -fsyntax-only -DLDRD_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
-FEAT_THUMB2!=if ${COMPILE.c} -fsyntax-only -DTHUMB2_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
+FEAT_EABI!=if ${COMPILE.c} ${COPTS} -fsyntax-only -DEABI_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
+FEAT_LDREX!=if ${COMPILE.c} ${COPTS} -fsyntax-only -DLDREX_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
+FEAT_LDRD!=if ${COMPILE.c} ${COPTS} -fsyntax-only -DLDRD_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
+FEAT_THUMB2!=if ${COMPILE.c} ${COPTS} -fsyntax-only -DTHUMB2_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
.endif
Index: src/lib/libarch/Makefile
diff -u src/lib/libarch/Makefile:1.28 src/lib/libarch/Makefile:1.28.2.1
--- src/lib/libarch/Makefile:1.28 Sun Aug 10 23:25:49 2014
+++ src/lib/libarch/Makefile Wed Jun 10 17:16:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/08/10 23:25:49 matt Exp $
+# $NetBSD: Makefile,v 1.28.2.1 2015/06/10 17:16:24 snj Exp $
.include <bsd.own.mk>
@@ -18,7 +18,7 @@ LIBC_MACHINE_CPU?= ${MACHINE_CPU}
# Build the library if SRCS is now defined ...
.if defined(SRCS)
-.if defined(MLIBDIR) && ${MLIBDIR} != "none" && ${LIBC_MACHINE_CPU} != "arm"
+.if defined(MLIBDIR) && ${LIBC_MACHINE_CPU} != "arm"
LIB= ${MLIBDIR}
.else
LIB= ${LIBC_MACHINE_CPU}
Index: src/lib/libarch/i386/Makefile.inc
diff -u src/lib/libarch/i386/Makefile.inc:1.14 src/lib/libarch/i386/Makefile.inc:1.14.24.1
--- src/lib/libarch/i386/Makefile.inc:1.14 Sun Dec 13 08:25:20 2009
+++ src/lib/libarch/i386/Makefile.inc Wed Jun 10 17:16:24 2015
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.14 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.14.24.1 2015/06/10 17:16:24 snj Exp $
-MLIBDIR?= none
-
-.if (${MACHINE_ARCH} == "i386" || ${MLIBDIR} == "i386")
+.if (${MACHINE_ARCH} == "i386" || ${MLIBDIR:Unone} == "i386")
SRCS+= i386_get_ldt.c i386_set_ldt.c \
i386_iopl.c i386_get_ioperm.c i386_set_ioperm.c \
i386_vm86.c i386_pmc.c i386_mtrr.c
Index: src/lib/libarch/x86_64/Makefile.inc
diff -u src/lib/libarch/x86_64/Makefile.inc:1.4 src/lib/libarch/x86_64/Makefile.inc:1.4.24.1
--- src/lib/libarch/x86_64/Makefile.inc:1.4 Sun Dec 13 08:25:20 2009
+++ src/lib/libarch/x86_64/Makefile.inc Wed Jun 10 17:16:24 2015
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.4.24.1 2015/06/10 17:16:24 snj Exp $
-MLIBDIR?= none
-
-.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR} != "i386")
+.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR:Unone} != "i386")
SRCS+= x86_64_mtrr.c x86_64_iopl.c
.endif
Index: src/share/mk/bsd.gcc.mk
diff -u src/share/mk/bsd.gcc.mk:1.10 src/share/mk/bsd.gcc.mk:1.10.8.1
--- src/share/mk/bsd.gcc.mk:1.10 Mon Dec 10 23:49:39 2012
+++ src/share/mk/bsd.gcc.mk Wed Jun 10 17:16:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.gcc.mk,v 1.10 2012/12/10 23:49:39 pooka Exp $
+# $NetBSD: bsd.gcc.mk,v 1.10.8.1 2015/06/10 17:16:24 snj Exp $
.if !defined(_BSD_GCC_MK_)
_BSD_GCC_MK_=1
@@ -21,14 +21,14 @@ _GCC_CRTN!= ${CC} --print-file-name=crt
_GCC_CRTDIR!= dirname ${_GCC_CRTBEGIN}
_GCC_LIBGCCDIR!= dirname `${CC} --print-libgcc-file-name`
.else
-_GCC_CRTBEGIN?= ${DESTDIR}/usr/lib/crtbegin.o
-_GCC_CRTBEGINS?= ${DESTDIR}/usr/lib/crtbeginS.o
-_GCC_CRTEND?= ${DESTDIR}/usr/lib/crtend.o
-_GCC_CRTENDS?= ${DESTDIR}/usr/lib/crtendS.o
-_GCC_CRTI?= ${DESTDIR}/usr/lib/crti.o
-_GCC_CRTN?= ${DESTDIR}/usr/lib/crtn.o
-_GCC_CRTDIR?= ${DESTDIR}/usr/lib
-_GCC_LIBGCCDIR?= ${DESTDIR}/usr/lib
+_GCC_CRTBEGIN?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtbegin.o
+_GCC_CRTBEGINS?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtbeginS.o
+_GCC_CRTEND?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtend.o
+_GCC_CRTENDS?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtendS.o
+_GCC_CRTI?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o
+_GCC_CRTN?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtn.o
+_GCC_CRTDIR?= ${DESTDIR}/usr/lib${MLIBDIR:D/${MLIBDIR}}
+_GCC_LIBGCCDIR?= ${DESTDIR}/usr/lib${MLIBDIR:D/${MLIBDIR}}
.endif
.endif # ! defined(_BSD_GCC_MK_)
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.290 src/share/mk/bsd.prog.mk:1.290.4.1
--- src/share/mk/bsd.prog.mk:1.290 Tue Mar 25 09:52:55 2014
+++ src/share/mk/bsd.prog.mk Wed Jun 10 17:16:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.290 2014/03/25 09:52:55 ozaki-r Exp $
+# $NetBSD: bsd.prog.mk,v 1.290.4.1 2015/06/10 17:16:24 snj Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -72,22 +72,22 @@ CTFMFLAGS+= -g
# ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
.ifndef LIBCRTBEGIN
-LIBCRTBEGIN= ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGIN}
+LIBCRTBEGIN= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o ${_GCC_CRTBEGIN}
.MADE: ${LIBCRTBEGIN}
.endif
.ifndef LIBCRTEND
-LIBCRTEND= ${_GCC_CRTEND} ${DESTDIR}/usr/lib/crtn.o
+LIBCRTEND= ${_GCC_CRTEND} ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtn.o
.MADE: ${LIBCRTEND}
.endif
_SHLINKER= ${SHLINKDIR}/ld.elf_so
.ifndef LIBCRT0
-LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
+LIBCRT0= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crt0.o
.MADE: ${LIBCRT0}
.endif
.ifndef LIBCRTI
-LIBCRTI= ${DESTDIR}/usr/lib/crti.o
+LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o
.MADE: ${LIBCRTI}
.endif
