Module Name: src
Committed By: mrg
Date: Sat Jan 19 20:02:06 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib: Makefile.gthr
src/external/gpl3/gcc/lib/libgcc/arch/x86_64: defs.mk
src/external/gpl3/gcc/lib/libobjc/arch/x86_64: defs.mk
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: defs.mk
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64: configargs.h
src/tools/gcc: mknative-gcc
Added Files:
src/external/gpl3/gcc/lib/libgcc/arch/x86_64: gthr-defs.mk
Log Message:
make includes works now.
pull out more data needed for headers and fix gthr-defaults.h.
libgcc_s has multiple symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/Makefile.gthr
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libgcc/arch/x86_64/gthr-defs.mk
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libobjc/arch/x86_64/defs.mk
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk
cvs rdiff -u -r1.20 -r1.21 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r1.39 -r1.40 \
src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h
cvs rdiff -u -r1.95 -r1.96 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/Makefile.gthr
diff -u src/external/gpl3/gcc/lib/Makefile.gthr:1.1 src/external/gpl3/gcc/lib/Makefile.gthr:1.2
--- src/external/gpl3/gcc/lib/Makefile.gthr:1.1 Sat Jan 19 17:11:02 2019
+++ src/external/gpl3/gcc/lib/Makefile.gthr Sat Jan 19 20:02:06 2019
@@ -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 @@ BUILDSYMLINKS+= ${CONFIG_LINKS}
. for _src _dst in ${CONFIG_LINKS}
DPSRCS+= ${_dst}
. endfor
+
.endif
Index: src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk:1.8 src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk:1.9
--- src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk:1.8 Sat Jan 19 17:11:56 2019
+++ src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk Sat Jan 19 20:02:06 2019
@@ -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_MAPFILES=libgcc-std.ver
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/b
miintrin.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/a
vx512dqintrin.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=
Index: src/external/gpl3/gcc/lib/libobjc/arch/x86_64/defs.mk
diff -u src/external/gpl3/gcc/lib/libobjc/arch/x86_64/defs.mk:1.3 src/external/gpl3/gcc/lib/libobjc/arch/x86_64/defs.mk:1.4
--- src/external/gpl3/gcc/lib/libobjc/arch/x86_64/defs.mk:1.3 Sat Jan 19 17:12:00 2019
+++ src/external/gpl3/gcc/lib/libobjc/arch/x86_64/defs.mk Sat Jan 19 20:02:06 2019
@@ -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_INCLUDES=-I${GNUHOSTDIST}/libobjc/../g
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=
Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk:1.10 src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk:1.11
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk:1.10 Sat Jan 19 17:12:04 2019
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk Sat Jan 19 20:02:06 2019
@@ -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_CSTDIO_H=config/io/c_io_stdio.h
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=
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.20 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.21
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.20 Sat Jan 19 17:11:02 2019
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Sat Jan 19 20:02:06 2019
@@ -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= basic_file.h c++allocator.h c
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 @@ INCS+= c++config.h
INCSDIR= /usr/include/g++/bits
+SYMLINKS+= ${INCSDIR}/gthr-posix.h ${INCSDIR}/gthr-default.h
+
.include "${.CURDIR}/../Makefile.includes"
CLEANFILES+= ${BUILDINCS}
Index: src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h:1.39 src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h:1.40
--- src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h:1.39 Sat Jan 19 17:12:04 2019
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h Sat Jan 19 20:02:06 2019
@@ -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. */
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.95 src/tools/gcc/mknative-gcc:1.96
--- src/tools/gcc/mknative-gcc:1.95 Sat Jan 19 17:08:39 2019
+++ src/tools/gcc/mknative-gcc Sat Jan 19 20:02:06 2019
@@ -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 @@ get_libgcc () {
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
Added files:
Index: src/external/gpl3/gcc/lib/libgcc/arch/x86_64/gthr-defs.mk
diff -u /dev/null src/external/gpl3/gcc/lib/libgcc/arch/x86_64/gthr-defs.mk:1.1
--- /dev/null Sat Jan 19 20:02:06 2019
+++ src/external/gpl3/gcc/lib/libgcc/arch/x86_64/gthr-defs.mk Sat Jan 19 20:02:06 2019
@@ -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
