[src/netbsd-7]: src Pull up following revision(s) (requested by martin in tic...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/netbsd-7]: src Pull up following revision(s) (requested by martin in tic...
From: snj <snj%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 03:09:33 +0000

details:   https://anonhg.NetBSD.org/src/rev/cfab321112b8
branches:  netbsd-7
changeset: 799432:cfab321112b8
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jun 10 17:16:23 2015 +0000

description:
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.

diffstat:

 common/lib/libc/arch/arm/features.mk |  10 +++++-----
 lib/libarch/Makefile                 |   4 ++--
 lib/libarch/i386/Makefile.inc        |   6 ++----
 lib/libarch/x86_64/Makefile.inc      |   6 ++----
 share/mk/bsd.gcc.mk                  |  18 +++++++++---------
 share/mk/bsd.prog.mk                 |  10 +++++-----
 6 files changed, 25 insertions(+), 29 deletions(-)

diffs (132 lines):

diff -r 561de460936d -r cfab321112b8 common/lib/libc/arch/arm/features.mk
--- a/common/lib/libc/arch/arm/features.mk      Wed Jun 10 16:59:32 2015 +0000
+++ b/common/lib/libc/arch/arm/features.mk      Wed Jun 10 17:16:23 2015 +0000
@@ -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
diff -r 561de460936d -r cfab321112b8 lib/libarch/Makefile
--- a/lib/libarch/Makefile      Wed Jun 10 16:59:32 2015 +0000
+++ b/lib/libarch/Makefile      Wed Jun 10 17:16:23 2015 +0000
@@ -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 @@
 
 # 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}
diff -r 561de460936d -r cfab321112b8 lib/libarch/i386/Makefile.inc
--- a/lib/libarch/i386/Makefile.inc     Wed Jun 10 16:59:32 2015 +0000
+++ b/lib/libarch/i386/Makefile.inc     Wed Jun 10 17:16:23 2015 +0000
@@ -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
diff -r 561de460936d -r cfab321112b8 lib/libarch/x86_64/Makefile.inc
--- a/lib/libarch/x86_64/Makefile.inc   Wed Jun 10 16:59:32 2015 +0000
+++ b/lib/libarch/x86_64/Makefile.inc   Wed Jun 10 17:16:23 2015 +0000
@@ -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
 
diff -r 561de460936d -r cfab321112b8 share/mk/bsd.gcc.mk
--- a/share/mk/bsd.gcc.mk       Wed Jun 10 16:59:32 2015 +0000
+++ b/share/mk/bsd.gcc.mk       Wed Jun 10 17:16:23 2015 +0000
@@ -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_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_)
diff -r 561de460936d -r cfab321112b8 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Wed Jun 10 16:59:32 2015 +0000
+++ b/share/mk/bsd.prog.mk      Wed Jun 10 17:16:23 2015 +0000
@@ -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 @@
 
 # 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

Prev by Date: [src/netbsd-7]: src Pull up following revision(s) (requested by rmind in tick...
Next by Date: [src/netbsd-7]: src/lib/libcurses Pull up following revision(s) (requested by...
Previous by Thread: [src/netbsd-7]: src Pull up following revision(s) (requested by rmind in tick...
Next by Thread: [src/netbsd-7]: src/lib/libcurses Pull up following revision(s) (requested by...
Indexes:

Home | Main Index | Thread Index | Old Index