CVS commit: [netbsd-8] src/tools

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Fri Oct 26 15:12:53 UTC 2018

Modified Files:
src/tools [netbsd-8]: Makefile.gnuhost

Log Message:
Apply patch, requested by maya in ticket #1070:

force build of gcc and friends with -std=gnu++03 when the host compiler
is clang. New clang versions default to newer c++ standards and the
old gcc in this branch has not been updated to those.


To generate a diff of this commit:
cvs rdiff -u -r1.44.8.2 -r1.44.8.3 src/tools/Makefile.gnuhost

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/Makefile.gnuhost
diff -u src/tools/Makefile.gnuhost:1.44.8.2 src/tools/Makefile.gnuhost:1.44.8.3
--- src/tools/Makefile.gnuhost:1.44.8.2	Wed Apr 18 14:01:16 2018
+++ src/tools/Makefile.gnuhost	Fri Oct 26 15:12:53 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.gnuhost,v 1.44.8.2 2018/04/18 14:01:16 martin Exp $
+#	$NetBSD: Makefile.gnuhost,v 1.44.8.3 2018/10/26 15:12:53 martin Exp $
 #
 # Rules used when building a GNU host package.  Expects MODULE to be set.
 #
@@ -19,8 +19,10 @@
 
 # Disable use of pre-compiled headers on Darwin.
 BUILD_OSTYPE!= uname -s
-.if ${BUILD_OSTYPE} == "Darwin"
+HOST_COMPILER_CLANG!= if ${HOST_CC} --version | grep -q -s clang; then echo yes; else echo no; fi
+.if ${HOST_COMPILER_CLANG} == "yes"
 HOST_CFLAGS+=-O2 -no-cpp-precomp
+HOST_CXXFLAGS+=-std=gnu++03
 .endif
 
 MAKE_PROGRAM?=	${MAKE}

CVS commit: [netbsd-8] src/tools/gcc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Sep  5 09:21:37 UTC 2018

Modified Files:
src/tools/gcc [netbsd-8]: mknative-gcc

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

tools/gcc/mknative-gcc: revision 1.94

also pullout INTERNAL_CFLAGS for the libgcc build, where it may have
-DHAVE_CC_TLS defined on the command line.  (we already collect all
the other components.)


To generate a diff of this commit:
cvs rdiff -u -r1.89.6.2 -r1.89.6.3 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/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.89.6.2 src/tools/gcc/mknative-gcc:1.89.6.3
--- src/tools/gcc/mknative-gcc:1.89.6.2	Wed Sep  5 08:59:04 2018
+++ src/tools/gcc/mknative-gcc	Wed Sep  5 09:21:37 2018
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc,v 1.89.6.2 2018/09/05 08:59:04 martin Exp $
+#	$NetBSD: mknative-gcc,v 1.89.6.3 2018/09/05 09:21:37 martin Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -71,7 +71,9 @@ get_libgcc () {
 	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 \

CVS commit: [netbsd-8] src/tools

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sat May  5 19:25:57 UTC 2018

Modified Files:
src/tools [netbsd-8]: Makefile.host
src/tools/binstall [netbsd-8]: Makefile
src/tools/binutils [netbsd-8]: Makefile
src/tools/compat [netbsd-8]: Makefile
src/tools/ctfconvert [netbsd-8]: Makefile
src/tools/ctfmerge [netbsd-8]: Makefile
src/tools/cvslatest [netbsd-8]: Makefile
src/tools/dbsym [netbsd-8]: Makefile
src/tools/dtc [netbsd-8]: Makefile
src/tools/gcc [netbsd-8]: Makefile
src/tools/gdb [netbsd-8]: Makefile
src/tools/genassym [netbsd-8]: Makefile
src/tools/gettext [netbsd-8]: Makefile
src/tools/libctf [netbsd-8]: Makefile
src/tools/libdwarf [netbsd-8]: Makefile
src/tools/libelf [netbsd-8]: Makefile
src/tools/libfdt [netbsd-8]: Makefile
src/tools/lorder [netbsd-8]: Makefile
src/tools/makekeys [netbsd-8]: Makefile
src/tools/mandoc [netbsd-8]: Makefile
src/tools/mdsetimage [netbsd-8]: Makefile
Added Files:
src/tools [netbsd-8]: Makefile.inc

Log Message:
Pull up following revision(s) (requested by christos in ticket #796):

tools/mdsetimage/Makefile: revision 1.15
tools/compat/Makefile: revision 1.82
tools/gdb/Makefile: revision 1.35
tools/lorder/Makefile: revision 1.13
tools/gcc/Makefile: revision 1.85
tools/dtc/Makefile: revision 1.3
tools/cvslatest/Makefile: revision 1.2
tools/ctfmerge/Makefile: revision 1.8
tools/libelf/Makefile: revision 1.9
tools/libdwarf/Makefile: revision 1.8
tools/ctfconvert/Makefile: revision 1.7
tools/makekeys/Makefile: revision 1.2
tools/gettext/Makefile: revision 1.7
tools/binstall/Makefile: revision 1.12
tools/libfdt/Makefile: revision 1.3
tools/libctf/Makefile: revision 1.7
tools/binutils/Makefile: revision 1.27
tools/mandoc/Makefile: revision 1.11
tools/Makefile.host: revision 1.32
tools/dbsym/Makefile: revision 1.13
tools/genassym/Makefile: revision 1.7
tools/Makefile.inc: revision 1.14

PR/53238: Robert Elz: Disable MKREPRO in tools; the host compiler might
not support the necessary options. This is done thusly:

1. Set MKREPRO=no in Makefile.host. This handles all the Makefiles that
   use it and don't include bsd.own.mk.
2. Create Makefile.inc and set MKREPRO=no in it. Change the Makefiles that
   include bsd.own.mk, to include bsd.init.mk which includes Makefile.inc
   first. This will also allow us to control other tools options from a
   single location if we need to.

XXX: pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.20.1 src/tools/Makefile.host
cvs rdiff -u -r0 -r1.16.2.2 src/tools/Makefile.inc
cvs rdiff -u -r1.11 -r1.11.22.1 src/tools/binstall/Makefile
cvs rdiff -u -r1.26 -r1.26.6.1 src/tools/binutils/Makefile
cvs rdiff -u -r1.81 -r1.81.8.1 src/tools/compat/Makefile
cvs rdiff -u -r1.6 -r1.6.8.1 src/tools/ctfconvert/Makefile
cvs rdiff -u -r1.7 -r1.7.8.1 src/tools/ctfmerge/Makefile
cvs rdiff -u -r1.1 -r1.1.8.1 src/tools/cvslatest/Makefile
cvs rdiff -u -r1.11 -r1.11.6.1 src/tools/dbsym/Makefile
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/tools/dtc/Makefile
cvs rdiff -u -r1.81.4.1 -r1.81.4.2 src/tools/gcc/Makefile
cvs rdiff -u -r1.30 -r1.30.6.1 src/tools/gdb/Makefile
cvs rdiff -u -r1.6 -r1.6.22.1 src/tools/genassym/Makefile
cvs rdiff -u -r1.6 -r1.6.22.1 src/tools/gettext/Makefile
cvs rdiff -u -r1.6 -r1.6.8.1 src/tools/libctf/Makefile
cvs rdiff -u -r1.7 -r1.7.18.1 src/tools/libdwarf/Makefile
cvs rdiff -u -r1.8 -r1.8.18.1 src/tools/libelf/Makefile
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/tools/libfdt/Makefile
cvs rdiff -u -r1.12 -r1.12.22.1 src/tools/lorder/Makefile
cvs rdiff -u -r1.1 -r1.1.8.1 src/tools/makekeys/Makefile
cvs rdiff -u -r1.9.8.1 -r1.9.8.2 src/tools/mandoc/Makefile
cvs rdiff -u -r1.13 -r1.13.6.1 src/tools/mdsetimage/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/Makefile.host
diff -u src/tools/Makefile.host:1.31 src/tools/Makefile.host:1.31.20.1
--- src/tools/Makefile.host:1.31	Fri Jun 14 16:10:02 2013
+++ src/tools/Makefile.host	Sat May  5 19:25:56 2018
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile.host,v 1.31 2013/06/14 16:10:02 tsutsui Exp $
+#	$NetBSD: Makefile.host,v 1.31.20.1 2018/05/05 19:25:56 martin Exp $
 
 NOINFO=		# defined
 NOLINT=		# defined
 NOMAN=		# defined
+MKREPRO=no	# Native toolchain might be unable to do it
 
 .include 
 

Index: src/tools/binstall/Makefile
diff -u src/tools/binstall/Makefile:1.11 src/tools/binstall/Makefile:1.11.22.1
--- src/tools/binstall/Makefile:1.11	Sat Mar 16 22:32:50 2013
+++ src/tools/binstall/Makefile	Sat May  5 19:25:56 2018
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.11 2013/03/16 22:32:50 christos Exp $
+#	$NetBSD: Makefile,v 1.11.22.1 2018

CVS commit: [netbsd-8] src/tools

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Sat Apr 14 10:44:56 UTC 2018

Modified Files:
src/tools [netbsd-8]: Makefile.gnuhost

Log Message:
Pull up following revision(s) (requested by maya in ticket #754):

tools/Makefile.gnuhost: revision 1.45

GCC build exceeds the macOS clang default bracket nesting level of 256.

Work around with -fbracket-depth=512.

>From potr in PR toolchain/53178.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.44.8.1 src/tools/Makefile.gnuhost

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/Makefile.gnuhost
diff -u src/tools/Makefile.gnuhost:1.44 src/tools/Makefile.gnuhost:1.44.8.1
--- src/tools/Makefile.gnuhost:1.44	Sat Jan 16 18:38:53 2016
+++ src/tools/Makefile.gnuhost	Sat Apr 14 10:44:56 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.gnuhost,v 1.44 2016/01/16 18:38:53 christos Exp $
+#	$NetBSD: Makefile.gnuhost,v 1.44.8.1 2018/04/14 10:44:56 martin Exp $
 #
 # Rules used when building a GNU host package.  Expects MODULE to be set.
 #
@@ -18,9 +18,12 @@
 .include 
 
 # Disable use of pre-compiled headers on Darwin.
+# GCC build exceeds the macOS clang default bracket nesting level of 256.
 BUILD_OSTYPE!= uname -s
 .if ${BUILD_OSTYPE} == "Darwin"
 HOST_CFLAGS+=-O2 -no-cpp-precomp
+HOST_CFLAGS+=-O2 -no-cpp-precomp -fbracket-depth=512
+HOST_CXXFLAGS+= -fbracket-depth=512
 .endif
 MAKE_PROGRAM?=	${MAKE}
 

CVS commit: [netbsd-8] src/tools/compat

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Feb  3 22:02:02 UTC 2018

Modified Files:
src/tools/compat [netbsd-8]: configure configure.ac nbtool_config.h.in

Log Message:
Pull up following revision(s) (requested by sevan in ticket #435):
tools/compat/configure: revision 1.88 via patch
tools/compat/configure.ac: revision 1.89 via patch
tools/compat/nbtool_config.h.in: revision 1.42
Add asnprintf() to the AC_CHECK_DECLS list.
Resolves conflict when cross compiling on Cygwin the provided implementation
does not get picked up.
Closes PR toolchain/52797
--
regen


To generate a diff of this commit:
cvs rdiff -u -r1.86.6.2 -r1.86.6.3 src/tools/compat/configure
cvs rdiff -u -r1.87.6.2 -r1.87.6.3 src/tools/compat/configure.ac
cvs rdiff -u -r1.40.6.2 -r1.40.6.3 src/tools/compat/nbtool_config.h.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.86.6.2 src/tools/compat/configure:1.86.6.3
--- src/tools/compat/configure:1.86.6.2	Thu Dec 21 23:06:58 2017
+++ src/tools/compat/configure	Sat Feb  3 22:02:02 2018
@@ -4520,6 +4520,19 @@ fi
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_ASPRINTF $ac_have_decl
 _ACEOF
+ac_fn_c_check_decl "$LINENO" "asnprintf" "ac_cv_have_decl_asnprintf" "
+#include 
+
+"
+if test "x$ac_cv_have_decl_asnprintf" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ASNPRINTF $ac_have_decl
+_ACEOF
 ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "
 #include 
 

Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.87.6.2 src/tools/compat/configure.ac:1.87.6.3
--- src/tools/compat/configure.ac:1.87.6.2	Thu Dec 21 23:06:58 2017
+++ src/tools/compat/configure.ac	Sat Feb  3 22:02:02 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.87.6.2 2017/12/21 23:06:58 snj Exp $
+#	$NetBSD: configure.ac,v 1.87.6.3 2018/02/03 22:02:02 snj Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@@ -140,7 +140,7 @@ AC_CHECK_MEMBERS(struct statvfs.f_iosize
 AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include ])
 
 # Global variable decls.
-AC_CHECK_DECLS([asprintf, vasprintf, vasnprintf, vsnprintf, fgetln, fparseln
+AC_CHECK_DECLS([asprintf, asnprintf, vasprintf, vasnprintf, vsnprintf, fgetln, fparseln
 	getdelim, getline, snprintf],,, [
 #include 
 ])

Index: src/tools/compat/nbtool_config.h.in
diff -u src/tools/compat/nbtool_config.h.in:1.40.6.2 src/tools/compat/nbtool_config.h.in:1.40.6.3
--- src/tools/compat/nbtool_config.h.in:1.40.6.2	Thu Dec 21 23:06:58 2017
+++ src/tools/compat/nbtool_config.h.in	Sat Feb  3 22:02:02 2018
@@ -1,6 +1,6 @@
 /* nbtool_config.h.in.  Generated from configure.ac by autoheader.  */
 
-/*  $NetBSD: nbtool_config.h.in,v 1.40.6.2 2017/12/21 23:06:58 snj Exp $*/
+/*  $NetBSD: nbtool_config.h.in,v 1.40.6.3 2018/02/03 22:02:02 snj Exp $*/
  
 #ifndef __NETBSD_NBTOOL_CONFIG_H__
 #define __NETBSD_NBTOOL_CONFIG_H__
@@ -47,6 +47,10 @@
 /* Define to 1 if you have the  header file. */
 #undef HAVE_CTYPE_H
 
+/* Define to 1 if you have the declaration of `asnprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ASNPRINTF
+
 /* Define to 1 if you have the declaration of `asprintf', and to 0 if you
don't. */
 #undef HAVE_DECL_ASPRINTF

CVS commit: [netbsd-8] src/tools/compat

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Thu Dec 21 19:11:21 UTC 2017

Modified Files:
src/tools/compat [netbsd-8]: compat_defs.h configure configure.ac
fpurge.c nbtool_config.h.in

Log Message:
Pull up following revision(s) (requested by sevan in ticket #435):
tools/compat/compat_defs.h: 1.108
tools/compat/configure: 1.87-1.88
tools/compat/configure.ac: 1.88-1.89
tools/compat/fpurge.c: 1.2
tools/compat/nbtool_config.h.in: 1.41-1.42
handle __fpurge being declared in 
--
regen
--
Add asnprintf() to the AC_CHECK_DECLS list.
Resolves conflict when cross compiling on Cygwin the provided implementation
does not get picked up.
Closes PR toolchain/52797
--
regen


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.107.6.1 src/tools/compat/compat_defs.h
cvs rdiff -u -r1.86 -r1.86.6.1 src/tools/compat/configure
cvs rdiff -u -r1.87 -r1.87.6.1 src/tools/compat/configure.ac
cvs rdiff -u -r1.1 -r1.1.38.1 src/tools/compat/fpurge.c
cvs rdiff -u -r1.40 -r1.40.6.1 src/tools/compat/nbtool_config.h.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/compat/compat_defs.h
diff -u src/tools/compat/compat_defs.h:1.107 src/tools/compat/compat_defs.h:1.107.6.1
--- src/tools/compat/compat_defs.h:1.107	Sat Jan  7 21:29:30 2017
+++ src/tools/compat/compat_defs.h	Thu Dec 21 19:11:21 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_defs.h,v 1.107 2017/01/07 21:29:30 christos Exp $	*/
+/*	$NetBSD: compat_defs.h,v 1.107.6.1 2017/12/21 19:11:21 snj Exp $	*/
 
 #ifndef	__NETBSD_COMPAT_DEFS_H__
 #define	__NETBSD_COMPAT_DEFS_H__
@@ -252,6 +252,10 @@ extern int optind, opterr, optopt;
 char *dirname(char *);
 #endif
 
+#if !HAVE_DECL_FPURGE
+void fpurge(FILE *);
+#endif
+
 #if !HAVE_DIRFD
 #if HAVE_DIR_DD_FD
 #define dirfd(dirp) ((dirp)->dd_fd)

Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.86 src/tools/compat/configure:1.86.6.1
--- src/tools/compat/configure:1.86	Sat Jan  7 21:31:07 2017
+++ src/tools/compat/configure	Thu Dec 21 19:11:21 2017
@@ -4097,7 +4097,7 @@ fi
 
 fi
 
-for ac_header in sys/mtio.h sys/sysmacros.h sys/syslimits.h \
+for ac_header in sys/mtio.h sys/sysmacros.h sys/syslimits.h stdio_ext.h \
 	getopt.h features.h malloc.h sys/poll.h pthread.h stddef.h rpc/types.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4520,6 +4520,19 @@ fi
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_ASPRINTF $ac_have_decl
 _ACEOF
+ac_fn_c_check_decl "$LINENO" "asnprintf" "ac_cv_have_decl_asnprintf" "
+#include 
+
+"
+if test "x$ac_cv_have_decl_asnprintf" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ASNPRINTF $ac_have_decl
+_ACEOF
 ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "
 #include 
 
@@ -4572,19 +4585,44 @@ fi
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_FGETLN $ac_have_decl
 _ACEOF
-ac_fn_c_check_decl "$LINENO" "fparseln
-	getdelim" "ac_cv_have_decl_fparseln__getdelim" "
+ac_fn_c_check_decl "$LINENO" "fparseln" "ac_cv_have_decl_fparseln" "
+#include 
+
+"
+if test "x$ac_cv_have_decl_fparseln" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FPARSELN $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "fpurge" "ac_cv_have_decl_fpurge" "
+#include 
+
+"
+if test "x$ac_cv_have_decl_fpurge" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FPURGE $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "
 #include 
 
 "
-if test "x$ac_cv_have_decl_fparseln__getdelim" = xyes; then :
+if test "x$ac_cv_have_decl_getdelim" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
 fi
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_FPARSELN__GETDELIM $ac_have_decl
+#define HAVE_DECL_GETDELIM $ac_have_decl
 _ACEOF
 ac_fn_c_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "
 #include 

Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.87 src/tools/compat/configure.ac:1.87.6.1
--- src/tools/compat/configure.ac:1.87	Sat Jan  7 21:30:42 2017
+++ src/tools/compat/configure.ac	Thu Dec 21 19:11:21 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.87 2017/01/07 21:30:42 christos Exp $
+#	$NetBSD: configure.ac,v 1.87.6.1 2017/12/21 19:11:21 snj Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@@ -78,7 +78,7 @@ AC_CHECK_HEADERS(sys/ioctl.h sys/mman.h 
 
 # Find headers that may not be available.
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS(sys/mtio.h sys/sysmacros.h sys/syslimits.h \
+AC_CHECK_HEADERS(sys/mtio.h sys/sysmacros.h sys/syslimits.h stdio_ext.h \
 	getopt.h features.h malloc.h sys/poll.h pthread.h stddef.h rpc/types.h)
 AC_CHECK_HEADERS(sys/bswap.h machine/bswap.h sys/cdefs.h machine/endian.h \
 	sys/endian.h sys/featuretest.h err.h inttypes.h libgen.h path

CVS commit: [netbsd-8] src/tools/gcc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Mon Oct  9 17:59:16 UTC 2017

Modified Files:
src/tools/gcc [netbsd-8]: Makefile mknative-gcc

Log Message:
Apply patch (requested by christos in ticket #312):
disable dual libstdc++ abi


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.81.4.1 src/tools/gcc/Makefile
cvs rdiff -u -r1.89 -r1.89.6.1 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/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.81 src/tools/gcc/Makefile:1.81.4.1
--- src/tools/gcc/Makefile:1.81	Wed Mar 22 23:11:10 2017
+++ src/tools/gcc/Makefile	Mon Oct  9 17:59:16 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.81 2017/03/22 23:11:10 chs Exp $
+#	$NetBSD: Makefile,v 1.81.4.1 2017/10/09 17:59:16 snj Exp $
 
 .include 
 
@@ -35,6 +35,7 @@ COMMON_CONFIGURE_ARGS=	--target=${MACHIN
 			--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
 			--with-pkgversion="NetBSD ${NETBSD_GCC_VERSION}" \
 			--with-system-zlib \
+			--disable-libstdcxx-dual-abi \
 			--enable-__cxa_atexit \
 			--enable-libstdcxx-time=rt \
 			--enable-libstdcxx-threads
@@ -190,6 +191,7 @@ NATIVE_CONFIGURE_ARGS+=	\
 			--disable-multilib \
 			--disable-symvers \
 			--disable-libstdcxx-pch \
+			--disable-libstdcxx-dual-abi \
 			--build=`${GCCDIST}/config.guess` \
 			--host=${MACHINE_GNU_PLATFORM} \
 			--with-sysroot=${DESTDIR}

Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.89 src/tools/gcc/mknative-gcc:1.89.6.1
--- src/tools/gcc/mknative-gcc:1.89	Wed Oct  5 19:25:49 2016
+++ src/tools/gcc/mknative-gcc	Mon Oct  9 17:59:16 2017
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc,v 1.89 2016/10/05 19:25:49 christos Exp $
+#	$NetBSD: mknative-gcc,v 1.89.6.1 2017/10/09 17:59:16 snj Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -380,7 +380,7 @@ __EOF__
 
 	# special transforms
 	for f in gtyp-input.list; do
-		sed -e 's/^.*external\/gpl3\/gcc\/dist/SRCDIR/' < $_TMPDIR/gcc/$f > $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
+		sed -e "s@^.*$_OUTDIRBASE/dist@SRCDIR@" < $_TMPDIR/gcc/$f > $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
 	done
 
 	# special platforms