Module Name: src
Committed By: martin
Date: Wed Sep 5 08:59:05 UTC 2018
Modified Files:
src/external/gpl3/gcc/dist/config [netbsd-8]: tls.m4
src/external/gpl3/gcc/dist/libgcc [netbsd-8]: configure
src/tools/gcc [netbsd-8]: gcc-version.mk mknative-gcc
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.34.1 \
src/external/gpl3/gcc/dist/config/tls.m4
cvs rdiff -u -r1.3 -r1.3.8.1 src/external/gpl3/gcc/dist/libgcc/configure
cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/tools/gcc/gcc-version.mk
cvs rdiff -u -r1.89.6.1 -r1.89.6.2 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/dist/config/tls.m4
diff -u src/external/gpl3/gcc/dist/config/tls.m4:1.1.1.1 src/external/gpl3/gcc/dist/config/tls.m4:1.1.1.1.34.1
--- src/external/gpl3/gcc/dist/config/tls.m4:1.1.1.1 Tue Jun 21 01:23:58 2011
+++ src/external/gpl3/gcc/dist/config/tls.m4 Wed Sep 5 08:59:05 2018
@@ -104,7 +104,7 @@ AC_DEFUN([GCC_CHECK_CC_TLS], [
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.])
Index: src/external/gpl3/gcc/dist/libgcc/configure
diff -u src/external/gpl3/gcc/dist/libgcc/configure:1.3 src/external/gpl3/gcc/dist/libgcc/configure:1.3.8.1
--- src/external/gpl3/gcc/dist/libgcc/configure:1.3 Sun Jan 24 09:43:35 2016
+++ src/external/gpl3/gcc/dist/libgcc/configure Wed Sep 5 08:59:05 2018
@@ -4940,6 +4940,11 @@ rm -f core conftest.err conftest.$ac_obj
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"
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.7.4.1 src/tools/gcc/gcc-version.mk:1.7.4.2
--- src/tools/gcc/gcc-version.mk:1.7.4.1 Sun Apr 1 09:00:42 2018
+++ src/tools/gcc/gcc-version.mk Wed Sep 5 08:59:04 2018
@@ -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
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.89.6.1 src/tools/gcc/mknative-gcc:1.89.6.2
--- src/tools/gcc/mknative-gcc:1.89.6.1 Mon Oct 9 17:59:16 2017
+++ src/tools/gcc/mknative-gcc Wed Sep 5 08:59:04 2018
@@ -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 @@ __EOF__
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
