[src/netbsd-8]: src Pull up following revision(s) (requested by mrg in ticket...

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

details:   https://anonhg.NetBSD.org/src/rev/cd026b07845d
branches:  netbsd-8
changeset: 435239:cd026b07845d
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Sep 05 08:59:04 2018 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1008):

        tools/gcc/gcc-version.mk: revision 1.11
        tools/gcc/mknative-gcc: revision 1.93
        external/gpl3/gcc/dist/config/tls.m4: revision 1.2
        external/gpl3/gcc/dist/libgcc/configure: revision 1.5

Correct extra parens, regen configure (selectively)
Fixes root cause of PR toolchain/53567

in configargs.h, as well as normalising to /usr/src, normalise the
--build to the same as the --host, so that it never changes based
upon the host you ran mknative on.  (some recent changes are only
because i updated a system from netbsd-7 to netbsd-8.  this will
avoid that in the future.)

remove GCC 5 marker.  this is now nb3 20180905.

diffstat:

 external/gpl3/gcc/dist/config/tls.m4    |  2 +-
 external/gpl3/gcc/dist/libgcc/configure |  5 +++++
 tools/gcc/gcc-version.mk                |  4 ++--
 tools/gcc/mknative-gcc                  |  9 ++++-----
 4 files changed, 12 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r f079f9b12558 -r cd026b07845d external/gpl3/gcc/dist/config/tls.m4
--- a/external/gpl3/gcc/dist/config/tls.m4      Wed Sep 05 08:45:52 2018 +0000
+++ b/external/gpl3/gcc/dist/config/tls.m4      Wed Sep 05 08:59:04 2018 +0000
@@ -104,7 +104,7 @@
                 gcc_cv_have_cc_tls, [
     AC_COMPILE_IFELSE([__thread int a; int b; int main() { return a = b; }],
       [gcc_cv_have_cc_tls=yes], [gcc_cv_have_cc_tls=no])]
-    )])
+    )
   if test "$enable_tls $gcc_cv_have_cc_tls" = "yes yes"; then
     AC_DEFINE(HAVE_CC_TLS, 1,
              [Define to 1 if the target assembler supports thread-local storage.])
diff -r f079f9b12558 -r cd026b07845d external/gpl3/gcc/dist/libgcc/configure
--- a/external/gpl3/gcc/dist/libgcc/configure   Wed Sep 05 08:45:52 2018 +0000
+++ b/external/gpl3/gcc/dist/libgcc/configure   Wed Sep 05 08:59:04 2018 +0000
@@ -4940,6 +4940,11 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_have_cc_tls" >&5
 $as_echo "$gcc_cv_have_cc_tls" >&6; }
+  if test "$enable_tls $gcc_cv_have_cc_tls" = "yes yes"; then
+
+$as_echo "#define HAVE_CC_TLS 1" >>confdefs.h
+
+  fi
 set_have_cc_tls=
 if test "$enable_tls $gcc_cv_have_cc_tls" = "yes yes"; then
   set_have_cc_tls="-DHAVE_CC_TLS"
diff -r f079f9b12558 -r cd026b07845d tools/gcc/gcc-version.mk
--- a/tools/gcc/gcc-version.mk  Wed Sep 05 08:45:52 2018 +0000
+++ b/tools/gcc/gcc-version.mk  Wed Sep 05 08:59:04 2018 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: gcc-version.mk,v 1.7.4.1 2018/04/01 09:00:42 martin Exp $
+#      $NetBSD: gcc-version.mk,v 1.7.4.2 2018/09/05 08:59:04 martin Exp $
 
 # common location for tools and native build
 
-NETBSD_GCC_VERSION=nb2 20180327
+NETBSD_GCC_VERSION=nb3 20180905
diff -r f079f9b12558 -r cd026b07845d tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Wed Sep 05 08:45:52 2018 +0000
+++ b/tools/gcc/mknative-gcc    Wed Sep 05 08:59:04 2018 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.89.6.1 2017/10/09 17:59:16 snj Exp $
+#      $NetBSD: mknative-gcc,v 1.89.6.2 2018/09/05 08:59:04 martin Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -366,10 +366,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