[src/trunk]: src/tools/gcc copy across GCC 6.4 mknative-gcc into mknative-gcc...

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

details:   https://anonhg.NetBSD.org/src/rev/9f773c9a4671
branches:  trunk
changeset: 993329:9f773c9a4671
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Sep 05 01:20:20 2018 +0000

description:
copy across GCC 6.4 mknative-gcc into mknative-gcc.old.

diffstat:

 tools/gcc/mknative-gcc.old |  20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diffs (60 lines):

diff -r 2edea6bd890a -r 9f773c9a4671 tools/gcc/mknative-gcc.old
--- a/tools/gcc/mknative-gcc.old        Wed Sep 05 00:51:42 2018 +0000
+++ b/tools/gcc/mknative-gcc.old        Wed Sep 05 01:20:20 2018 +0000
@@ -1,10 +1,10 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc.old,v 1.5 2017/10/04 21:42:20 christos Exp $
+#      $NetBSD: mknative-gcc.old,v 1.6 2018/09/05 01:20:20 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
 #
-# This version is for GCC 5.3
+# This version is for GCC 6.4
 
 # initialise
 
@@ -71,7 +71,9 @@
        cd $_TMPDIR/$_PLATFORM/libgcc
        {
                getvars $_PLATFORM/libgcc/Makefile \
-                       INCLUDES LIB2ADD LIB2ADDEH LIB2ADD_ST \
+                       INCLUDES \
+                       INTERNAL_CFLAGS \
+                       LIB2ADD LIB2ADDEH LIB2ADD_ST \
                        LIB1ASMFUNCS LIB1ASMSRC \
                        LIB2_DIVMOD_FUNCS LIB2FUNCS_ST \
                        LIB2FUNCS_EXTRA \
@@ -221,6 +223,9 @@
                <$_TMPDIR/$_PLATFORM/libstdc++-v3/include/gstdint.h
 
        {
+               getvars $_PLATFORM/libstdc++-v3/Makefile \
+                       port_specific_symbol_files
+
                # libsupc++
                getvars $_PLATFORM/libstdc++-v3/libsupc++/Makefile \
                        sources | sed 's/^G_sources=/G_LIBSUPCXX_SOURCES=/'
@@ -303,7 +308,7 @@
                        -e 's#build/##g'
                getvars gcc/Makefile \
                        ALL_CFLAGS ALL_CPPFLAGS C_AND_OBJC_OBJS C_OBJS CCCP_OBJS \
-                       GCC_OBJS GCOV_OBJS GXX_OBJS GTM_H PROTO_OBJS ${_extravars1} \
+                       GCC_OBJS GCOV_OBJS GCOV_DUMP_OBJS GXX_OBJS GTM_H PROTO_OBJS ${_extravars1} \
                        INCLUDES md_file OBJC_OBJS OBJS out_file version \
                        BUILD_PREFIX RTL_H RTL_BASE_H TREE_H ${_hconfig_h} BASIC_BLOCK_H GCC_H \
                        GGC_H \
@@ -366,10 +371,9 @@
                if [ "${f}" = "configargs" ]
                then
                        _srcquoted=$(echo "$_SRC" | sed 's/\//\\\//g')
-                       ex <<__EOF__ $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
-/static const char configuration_arguments/ s/$_srcquoted/\/usr\/src/g
-wq
-__EOF__
+                       sed -i -E -e "s,$_srcquoted,/usr/src,g" \
+                                 -e 's/--build=[^ ]+ --host=([^ ]+)/--build=\1 --host=\1/' \
+                               $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
                fi
        done