[src/trunk]: src/tools/gcc mknative-gcc is for GCC 8.4.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa41e518de26
branches:  trunk
changeset: 974810:fa41e518de26
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Aug 12 08:53:20 2020 +0000

description:
mknative-gcc is for GCC 8.4.
mknative-gcc.old is supposed to be for GCC 7, but is the GCC 6
version.  update it and mark it for GCC 7.5.

diffstat:

 tools/gcc/mknative-gcc     |   4 +-
 tools/gcc/mknative-gcc.old |  47 ++++++++++++++++++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 12 deletions(-)

diffs (160 lines):

diff -r 67aa6432e365 -r fa41e518de26 tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Wed Aug 12 07:37:39 2020 +0000
+++ b/tools/gcc/mknative-gcc    Wed Aug 12 08:53:20 2020 +0000
@@ -1,10 +1,10 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.103 2019/10/24 03:19:14 christos Exp $
+#      $NetBSD: mknative-gcc,v 1.104 2020/08/12 08:53:20 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
 #
-# This version is for GCC 6.4
+# This version is for GCC 8.4
 
 # initialise
 
diff -r 67aa6432e365 -r fa41e518de26 tools/gcc/mknative-gcc.old
--- a/tools/gcc/mknative-gcc.old        Wed Aug 12 07:37:39 2020 +0000
+++ b/tools/gcc/mknative-gcc.old        Wed Aug 12 08:53:20 2020 +0000
@@ -1,10 +1,10 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc.old,v 1.6 2018/09/05 01:20:20 mrg Exp $
+#      $NetBSD: mknative-gcc.old,v 1.7 2020/08/12 08:53:20 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
 #
-# This version is for GCC 6.4
+# This version is for GCC 7.5
 
 # initialise
 
@@ -24,8 +24,8 @@
 
 . $_TOP/tools/gcc/mknative.common
 
-_OUTDIR="$_TOP/external/gpl3/gcc.old"
-_OUTDIRBASE="external/gpl3/gcc.old"
+_OUTDIR="$_TOP/external/gpl3/gcc"
+_OUTDIRBASE="external/gpl3/gcc"
 
 sanitise_includes () {
        sed \
@@ -82,10 +82,18 @@
                        SHLIB_MAPFILES SHLIB_NM_FLAGS
                getvars gcc/Makefile \
                        NOEXCEPTION_FLAGS EXTRA_HEADERS
-               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
+       }       | sanitise_includes \
+               | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/gthr-defs.mk
+
        if [ "${MACHINE_ARCH}" = "m68000" ]
        then
                ex <<__EOF__ $_OUTDIR/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk
@@ -152,6 +160,11 @@
        _subdir="$1"
 
        mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
+
+       getvars $_PLATFORM/libgomp/Makefile \
+               libgomp_la_SOURCES \
+               | write_mk $_OUTDIRBASE/lib/$_subdir/defs.mk
+
        write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
                <$_TMPDIR/$_PLATFORM/libgomp/config.h
        write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/libgomp_f.h \
@@ -169,9 +182,9 @@
 
        mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
        write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
-               <$_TMPDIR/$_subdir/config.h
+               <$_TMPDIR/$_PLATFORM/$_subdir/config.h
        write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/backtrace-supported.h \
-               <$_TMPDIR/$_subdir/backtrace-supported.h
+               <$_TMPDIR/$_PLATFORM/$_subdir/backtrace-supported.h
 }
 
 ##### lib/libobjc #####
@@ -189,7 +202,6 @@
                getvars $_PLATFORM/libobjc/Makefile \
                        ALL_CFLAGS INCLUDES OBJC_SOURCE_FILES C_SOURCE_FILES OBJC_H \
                        | sed "s,$_GNU_DIST,\${GNUHOSTDIST},g"
-               getlinks $_TMPDIR/$_PLATFORM/libgcc/config.status libgcc
        } | sanitise_includes \
          | write_mk $_OUTDIRBASE/lib/$_subdir/defs.mk
 
@@ -205,7 +217,7 @@
 
        mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
 
-       _build_headers="c++config.h cxxabi_tweaks.h gthr-posix.h gthr-single.h gthr.h"
+       _build_headers="c++config.h cxxabi_tweaks.h"
        _headers1="c_base_headers_extra_install"
        _headers1="$_headers1 tr1_headers tr2_headers decimal_headers c_compatibility_headers_install"
        _headers1="$_headers1 debug_headers parallel_headers"
@@ -221,10 +233,15 @@
 
        write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/gstdint.h \
                <$_TMPDIR/$_PLATFORM/libstdc++-v3/include/gstdint.h
+       write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/symver-config.h \
+               <$_TMPDIR/$_PLATFORM/libstdc++-v3/config.h
 
        {
                getvars $_PLATFORM/libstdc++-v3/Makefile \
                        port_specific_symbol_files
+               getvars $_PLATFORM/libstdc++-v3/src/Makefile \
+                       cxx11_sources \
+                       cxx98_sources
 
                # libsupc++
                getvars $_PLATFORM/libstdc++-v3/libsupc++/Makefile \
@@ -247,6 +264,9 @@
                        GLIBCXX_ABI_FLAGS libc__98convenience_la_SOURCES | \
                        sed -e 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/' \
                            -e 's/codecvt.cc/c98-codecvt.cc/'
+               getvars $_PLATFORM/libstdc++-v3/src/filesystem/Makefile \
+                       libstdc__fs_la_SOURCES | \
+                       sed -e 's/^G_libstdc__fs_la_SOURCES=/G_FILESYSTEM_SOURCES=/'
                getvars $_PLATFORM/libstdc++-v3/Makefile ATOMICITY_SRCDIR \
                        BASIC_FILE_CC CLOCALE_CC CCODECVT_CC CCOLLATE_CC \
                        CCTYPE_CC  CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_CC \
@@ -263,7 +283,6 @@
                        $_pf_headers | sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/profile/##g'
                getvars $_PLATFORM/libstdc++-v3/include/Makefile \
                        BASIC_FILE_H ALLOCATOR_H CSTDIO_H CLOCALE_H CMESSAGES_H CTIME_H
-               getlinks $_TMPDIR/$_PLATFORM/libgcc/config.status libgcc
        } | sanitise_includes \
          | write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/defs.mk
 }
@@ -288,6 +307,7 @@
        mkdir -p $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH
        mkdir -p $_OUTDIR/usr.bin/libcpp/arch/$MACHINE_ARCH
        mkdir -p $_OUTDIR/usr.bin/include/arch
+       mkdir -p $_OUTDIR/usr.bin/common-target/arch
        _buildname="BUILD_"
        _libcppsubdir=""
        _extravars="TM_H ALL_OPT_FILES"
@@ -338,6 +358,13 @@
                EXTRA_HEADERS \
                        | write_mk $_OUTDIRBASE/usr.bin/include/arch/$MACHINE_ARCH.mk
 
+       getvars gcc/Makefile \
+               OBJS-libcommon \
+                       | write_mk $_OUTDIRBASE/usr.bin/common/defs.mk
+       getvars gcc/Makefile \
+               OBJS-libcommon-target \
+                       | write_mk $_OUTDIRBASE/usr.bin/common-target/arch/$MACHINE_ARCH.mk
+
        write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
        hfiles='auto-host configargs config bconfig bversion plugin-version multilib tm'
        for f in $hfiles; do