[src/trunk]: src make includes works now.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src make includes works now.
From: mrg <mrg%NetBSD.org@localhost>
Date: Thu, 31 Jan 2019 10:39:59 +0000
details:   https://anonhg.NetBSD.org/src/rev/e44c228f5e39
branches:  trunk
changeset: 448043:e44c228f5e39
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jan 19 20:02:06 2019 +0000

description:
make includes works now.

pull out more data needed for headers and fix gthr-defaults.h.

libgcc_s has multiple symbols.

diffstat:

 external/gpl3/gcc/lib/Makefile.gthr                      |   8 +++++++-
 external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk         |   4 ++--
 external/gpl3/gcc/lib/libgcc/arch/x86_64/gthr-defs.mk    |   9 +++++++++
 external/gpl3/gcc/lib/libobjc/arch/x86_64/defs.mk        |   4 ++--
 external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk   |   4 ++--
 external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile |   7 ++++---
 external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h   |   2 +-
 tools/gcc/mknative-gcc                                   |  13 +++++++++----
 8 files changed, 36 insertions(+), 15 deletions(-)

diffs (155 lines):

diff -r dd30d7be07a2 -r e44c228f5e39 external/gpl3/gcc/lib/Makefile.gthr
--- a/external/gpl3/gcc/lib/Makefile.gthr       Sat Jan 19 17:11:52 2019 +0000
+++ b/external/gpl3/gcc/lib/Makefile.gthr       Sat Jan 19 20:02:06 2019 +0000
@@ -1,8 +1,13 @@
-#      $NetBSD: Makefile.gthr,v 1.1 2019/01/19 17:11:02 mrg Exp $
+#      $NetBSD: Makefile.gthr,v 1.2 2019/01/19 20:02:06 mrg Exp $
 
 # makefile fragment to setup files selected by configure
 
 .if ${MKGCC} != "no"
+
+LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
+
+. -include "${DIST}/../lib/libgcc/arch/${LIBGCC_MACHINE_ARCH}/gthr-defs.mk"
+
 CONFIG_LINKS= \
        ${G_enable_execute_stack}       enable-execute-stack.c \
        ${G_unwind_header}              unwind.h \
@@ -13,4 +18,5 @@
 . for _src _dst in ${CONFIG_LINKS}
 DPSRCS+=       ${_dst}
 . endfor
+
 .endif
diff -r dd30d7be07a2 -r e44c228f5e39 external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk
--- a/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk  Sat Jan 19 17:11:52 2019 +0000
+++ b/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk  Sat Jan 19 20:02:06 2019 +0000
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.94 2018/09/04 22:57:25 mrg Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.95 2019/01/19 17:08:39 mrg Exp 
 # Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp 
 #
 G_INCLUDES=-I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include 
@@ -19,4 +19,4 @@
 G_SHLIB_NM_FLAGS=-pg
 G_NOEXCEPTION_FLAGS=-fno-exceptions -fno-rtti -fasynchronous-unwind-tables
 G_EXTRA_HEADERS=${GNUHOSTDIST}/gcc/config/i386/cpuid.h ${GNUHOSTDIST}/gcc/config/i386/mmintrin.h ${GNUHOSTDIST}/gcc/config/i386/mm3dnow.h ${GNUHOSTDIST}/gcc/config/i386/xmmintrin.h 
${GNUHOSTDIST}/gcc/config/i386/emmintrin.h ${GNUHOSTDIST}/gcc/config/i386/pmmintrin.h ${GNUHOSTDIST}/gcc/config/i386/tmmintrin.h ${GNUHOSTDIST}/gcc/config/i386/ammintrin.h 
${GNUHOSTDIST}/gcc/config/i386/smmintrin.h ${GNUHOSTDIST}/gcc/config/i386/nmmintrin.h ${GNUHOSTDIST}/gcc/config/i386/bmmintrin.h ${GNUHOSTDIST}/gcc/config/i386/fma4intrin.h 
${GNUHOSTDIST}/gcc/config/i386/wmmintrin.h ${GNUHOSTDIST}/gcc/config/i386/immintrin.h ${GNUHOSTDIST}/gcc/config/i386/x86intrin.h ${GNUHOSTDIST}/gcc/config/i386/avxintrin.h 
${GNUHOSTDIST}/gcc/config/i386/xopintrin.h ${GNUHOSTDIST}/gcc/config/i386/ia32intrin.h ${GNUHOSTDIST}/gcc/config/i386/cross-stdarg.h ${GNUHOSTDIST}/gcc/config/i386/lwpintrin.h 
${GNUHOSTDIST}/gcc/config/i386/popcntintrin.h ${GNUHOSTDIST}/gcc/config/i386/lzcntintrin.h ${GNUHOSTDIST}/gcc/config/i386/bmiintrin.h ${GNUHOSTDIST}/gcc/config/i386/tbmintrin.h 
${GNUHOSTDIST}/gcc/config/i386/bmi2intrin.h ${GNUHOSTDIST}/gcc/config/i386/avx2intrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512fintrin.h ${GNUHOSTDIST}/gcc/config/i386/fmaintrin.h 
${GNUHOSTDIST}/gcc/config/i386/f16cintrin.h ${GNUHOSTDIST}/gcc/config/i386/rtmintrin.h ${GNUHOSTDIST}/gcc/config/i386/xtestintrin.h ${GNUHOSTDIST}/gcc/config/i386/rdseedintrin.h 
${GNUHOSTDIST}/gcc/config/i386/prfchwintrin.h ${GNUHOSTDIST}/gcc/config/i386/adxintrin.h ${GNUHOSTDIST}/gcc/config/i386/fxsrintrin.h ${GNUHOSTDIST}/gcc/config/i386/xsaveintrin.h 
${GNUHOSTDIST}/gcc/config/i386/xsaveoptintrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512cdintrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512erintrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512pfintrin.h 
${GNUHOSTDIST}/gcc/config/i386/shaintrin.h ${GNUHOSTDIST}/gcc/config/i386/clflushoptintrin.h ${GNUHOSTDIST}/gcc/config/i386/xsavecintrin.h ${GNUHOSTDIST}/gcc/config/i386/xsavesintrin.h 
${GNUHOSTDIST}/gcc/config/i386/avx512dqintrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512bwintrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512vlintrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512vlbwintrin.h 
${GNUHOSTDIST}/gcc/config/i386/avx512vldqintrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512ifmaintrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512ifmavlintrin.h 
${GNUHOSTDIST}/gcc/config/i386/avx512vbmiintrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512vbmivlintrin.h ${GNUHOSTDIST}/gcc/config/i386/avx5124fmapsintrin.h 
${GNUHOSTDIST}/gcc/config/i386/avx5124vnniwintrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512vpopcntdqintrin.h ${GNUHOSTDIST}/gcc/config/i386/clwbintrin.h ${GNUHOSTDIST}/gcc/config/i386/mwaitxintrin.h 
${GNUHOSTDIST}/gcc/config/i386/clzerointrin.h ${GNUHOSTDIST}/gcc/config/i386/pkuintrin.h ${GNUHOSTDIST}/gcc/config/i386/sgxintrin.h ${GNUHOSTDIST}/gcc/ginclude/tgmath.h mm_malloc.h
-G_CONFIG_LINKS=
+G_CONFIGLINKS=
diff -r dd30d7be07a2 -r e44c228f5e39 external/gpl3/gcc/lib/libgcc/arch/x86_64/gthr-defs.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/lib/libgcc/arch/x86_64/gthr-defs.mk     Sat Jan 19 20:02:06 2019 +0000
@@ -0,0 +1,9 @@
+# This file is automatically generated.  DO NOT EDIT!
+# Generated from: NetBSD: mknative-gcc,v 1.95 2019/01/19 17:08:39 mrg Exp 
+# Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp 
+#
+G_enable_execute_stack=enable-execute-stack-mprotect.c
+G_unwind_header=unwind-generic.h
+G_md_unwind_header=no-unwind.h
+G_sfp_machine_header=i386/sfp-machine.h
+G_thread_header=gthr-posix.h
diff -r dd30d7be07a2 -r e44c228f5e39 external/gpl3/gcc/lib/libobjc/arch/x86_64/defs.mk
--- a/external/gpl3/gcc/lib/libobjc/arch/x86_64/defs.mk Sat Jan 19 17:11:52 2019 +0000
+++ b/external/gpl3/gcc/lib/libobjc/arch/x86_64/defs.mk Sat Jan 19 20:02:06 2019 +0000
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.94 2018/09/04 22:57:25 mrg Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.95 2019/01/19 17:08:39 mrg Exp 
 # Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp 
 #
 G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/brig/lang.opt ${GNUHOSTDIST}/gcc/lto/lang.opt ${GNUHOSTDIST}/gcc/c-family/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/fused-madd.opt 
${GNUHOSTDIST}/gcc/config/i386/i386.opt ${GNUHOSTDIST}/gcc/config/netbsd.opt ${GNUHOSTDIST}/gcc/config/netbsd-elf.opt
@@ -8,4 +8,4 @@
 G_OBJC_SOURCE_FILES=NXConstStr.m Object.m Protocol.m accessors.m linking.m
 G_C_SOURCE_FILES=class.c encoding.c error.c gc.c hash.c init.c ivars.c memory.c methods.c nil_method.c objc-foreach.c objc-sync.c objects.c protocols.c sarray.c selector.c sendmsg.c thr.c exception.c
 G_OBJC_H=objc.h objc-exception.h objc-sync.h NXConstStr.h Object.h Protocol.h message.h objc-decls.h runtime.h thr.h
-G_CONFIG_LINKS=
+G_CONFIGLINKS=
diff -r dd30d7be07a2 -r e44c228f5e39 external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk
--- a/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk    Sat Jan 19 17:11:52 2019 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk    Sat Jan 19 20:02:06 2019 +0000
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.94 2018/09/04 22:57:25 mrg Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.95 2019/01/19 17:08:39 mrg Exp 
 # Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp 
 #
 G_port_specific_symbol_files=${GNUHOSTDIST}/libstdc++-v3/config/abi/pre/float128.ver
@@ -50,4 +50,4 @@
 G_CLOCALE_H=config/locale/generic/c_locale.h
 G_CMESSAGES_H=config/locale/generic/messages_members.h
 G_CTIME_H=config/locale/generic/time_members.h
-G_CONFIG_LINKS=
+G_CONFIGLINKS=
diff -r dd30d7be07a2 -r e44c228f5e39 external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile  Sat Jan 19 17:11:52 2019 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile  Sat Jan 19 20:02:06 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.20 2019/01/19 17:11:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.21 2019/01/19 20:02:06 mrg Exp $
 
 .include <bsd.init.mk>
 
@@ -12,8 +12,7 @@
 BUILDINCS+=    messages_members.h time_members.h opt_random.h
 
 INCS=          ${G_bits_headers} ${G_c_base_headers_extra} ${G_host_headers}
-# XXX gthr-default.h should be a symlink to gthr-posix.h
-INCS+=         gthr-default.h gthr.h gthr-single.h gthr-posix.h
+INCS+=         gthr.h gthr-single.h gthr-posix.h
 INCS+=         ${BUILDINCS}
 
 # libsupc++
@@ -28,6 +27,8 @@
 
 INCSDIR=       /usr/include/g++/bits
 
+SYMLINKS+=     ${INCSDIR}/gthr-posix.h ${INCSDIR}/gthr-default.h
+
 .include "${.CURDIR}/../Makefile.includes"
 
 CLEANFILES+=   ${BUILDINCS}
diff -r dd30d7be07a2 -r e44c228f5e39 external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h
--- a/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h    Sat Jan 19 17:11:52 2019 +0000
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h    Sat Jan 19 20:02:06 2019 +0000
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.94 2018/09/04 22:57:25 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.95 2019/01/19 17:08:39 mrg Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp  */
 
 /* Generated automatically. */
diff -r dd30d7be07a2 -r e44c228f5e39 tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Sat Jan 19 17:11:52 2019 +0000
+++ b/tools/gcc/mknative-gcc    Sat Jan 19 20:02:06 2019 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.95 2019/01/19 17:08:39 mrg Exp $
+#      $NetBSD: mknative-gcc,v 1.96 2019/01/19 20:02:06 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -82,13 +82,18 @@
                        SHLIB_MAPFILES SHLIB_NM_FLAGS
                getvars gcc/Makefile \
                        NOEXCEPTION_FLAGS EXTRA_HEADERS
-               getvars gcc/Makefile \
+               getlinks config.status libgcc
+       }       | sanitise_includes \
+               | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk
+
+       cd $_TMPDIR/$_PLATFORM/libgcc
+       {
+               getvars $_PLATFORM/libgcc/Makefile \
                        enable_execute_stack \
                        unwind_header md_unwind_header \
                        sfp_machine_header thread_header
-               getlinks config.status libgcc
        }       | sanitise_includes \
-               | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk
+               | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/gthr-defs.mk
 
        if [ "${MACHINE_ARCH}" = "m68000" ]
        then
Prev by Date: [src/trunk]: src/sys/kern thmap: use KM_NOSLEEP for now; might revisit later.
Next by Date: [src/trunk]: src/sys/dev/fdt Add a helper to search the tree for a node with ...
Previous by Thread: [src/trunk]: src/sys/kern thmap: use KM_NOSLEEP for now; might revisit later.
Next by Thread: [src/trunk]: src/sys/dev/fdt Add a helper to search the tree for a node with ...
Indexes:
Home | Main Index | Thread Index | Old Index