Module Name:    src
Committed By:   mrg
Date:           Wed Mar 16 10:56:20 UTC 2016

Modified Files:
        src/external/gpl3/gcc/lib/crtstuff/arch: i386.mk
        src/external/gpl3/gcc/lib/libgcc: Makefile
        src/external/gpl3/gcc/lib/libgcc/arch/i386: defs.mk
        src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386: c++config.h
        src/external/gpl3/gcc/usr.bin/backend: Makefile
        src/external/gpl3/gcc/usr.bin/gcc/arch/i386: auto-host.h configargs.h

Log Message:
for now, use a mknative-gcc copy of insn-modes.h and ensure that it
matches during the build.  the copy is used for everything, but it
is needed for libgcc and libgomp early on.

regen i386.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/crtstuff/arch/i386.mk
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libgcc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk
cvs rdiff -u -r1.16 -r1.17 \
    src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h
cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.7 -r1.8 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h
cvs rdiff -u -r1.23 -r1.24 \
    src/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h

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/lib/crtstuff/arch/i386.mk
diff -u src/external/gpl3/gcc/lib/crtstuff/arch/i386.mk:1.7 src/external/gpl3/gcc/lib/crtstuff/arch/i386.mk:1.8
--- src/external/gpl3/gcc/lib/crtstuff/arch/i386.mk:1.7	Tue Mar 15 06:16:22 2016
+++ src/external/gpl3/gcc/lib/crtstuff/arch/i386.mk	Wed Mar 16 10:56:20 2016
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.83 2016/03/15 03:22:06 mrg Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.85 2016/03/15 21:38:32 mrg Exp 
 # Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp 
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include     -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber -I${GNUHOSTDIST}/gcc/../libbacktrace 

Index: src/external/gpl3/gcc/lib/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile:1.4 src/external/gpl3/gcc/lib/libgcc/Makefile:1.5
--- src/external/gpl3/gcc/lib/libgcc/Makefile:1.4	Wed Mar 16 05:44:16 2016
+++ src/external/gpl3/gcc/lib/libgcc/Makefile	Wed Mar 16 10:56:20 2016
@@ -1,24 +1,7 @@
-#	$NetBSD: Makefile,v 1.4 2016/03/16 05:44:16 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2016/03/16 10:56:20 mrg Exp $
 
 .include <bsd.own.mk>
 
-# XXXGCC5
-#
-# XXX libgcc (and libobjc) need insn-modes.h.
-# XXX for now, when doing make obj, create these needed objdirs
-# XXX in the obj phase, so that both normal and compat builds
-# XXX get here
-
-.if make(obj)
-SUBDIR+=	../../usr.bin/host-libiberty .WAIT
-SUBDIR+=	../../usr.bin/backend .WAIT
-.endif
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
-	${MAKEDIRTARGET} ../../usr.bin/host-libiberty all
-	${MAKEDIRTARGET} ../../usr.bin/backend insn-modes.h
-.endif
-
 SUBDIR+=	libgcc
 
 .if ${MKPIC} != "no"

Index: src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk:1.2 src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk:1.3
--- src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk:1.2	Tue Mar 15 06:16:22 2016
+++ src/external/gpl3/gcc/lib/libgcc/arch/i386/defs.mk	Wed Mar 16 10:56:20 2016
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.83 2016/03/15 03:22:06 mrg Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.85 2016/03/15 21:38:32 mrg Exp 
 # Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp 
 #
 G_INCLUDES=-I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include 

Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h:1.16 src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h:1.17
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h:1.16	Tue Mar 15 19:18:00 2016
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h	Wed Mar 16 10:56:20 2016
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.84 2016/03/15 06:10:13 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.85 2016/03/15 21:38:32 mrg Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 // Predefined symbols and macros -*- C++ -*-
@@ -527,31 +527,31 @@ namespace std
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the `acosf' function. */
-/* #undef _GLIBCXX_HAVE_ACOSF */
+#define _GLIBCXX_HAVE_ACOSF 1
 
 /* Define to 1 if you have the `acosl' function. */
-/* #undef _GLIBCXX_HAVE_ACOSL */
+#define _GLIBCXX_HAVE_ACOSL 1
 
 /* Define to 1 if you have the `asinf' function. */
-/* #undef _GLIBCXX_HAVE_ASINF */
+#define _GLIBCXX_HAVE_ASINF 1
 
 /* Define to 1 if you have the `asinl' function. */
-/* #undef _GLIBCXX_HAVE_ASINL */
+#define _GLIBCXX_HAVE_ASINL 1
 
 /* Define to 1 if the target assembler supports .symver directive. */
 #define _GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE 1
 
 /* Define to 1 if you have the `atan2f' function. */
-/* #undef _GLIBCXX_HAVE_ATAN2F */
+#define _GLIBCXX_HAVE_ATAN2F 1
 
 /* Define to 1 if you have the `atan2l' function. */
-/* #undef _GLIBCXX_HAVE_ATAN2L */
+#define _GLIBCXX_HAVE_ATAN2L 1
 
 /* Define to 1 if you have the `atanf' function. */
-/* #undef _GLIBCXX_HAVE_ATANF */
+#define _GLIBCXX_HAVE_ATANF 1
 
 /* Define to 1 if you have the `atanl' function. */
-/* #undef _GLIBCXX_HAVE_ATANL */
+#define _GLIBCXX_HAVE_ATANL 1
 
 /* Define to 1 if you have the `at_quick_exit' function. */
 #define _GLIBCXX_HAVE_AT_QUICK_EXIT 1
@@ -560,25 +560,25 @@ namespace std
 /* #undef _GLIBCXX_HAVE_CC_TLS */
 
 /* Define to 1 if you have the `ceilf' function. */
-/* #undef _GLIBCXX_HAVE_CEILF */
+#define _GLIBCXX_HAVE_CEILF 1
 
 /* Define to 1 if you have the `ceill' function. */
-/* #undef _GLIBCXX_HAVE_CEILL */
+#define _GLIBCXX_HAVE_CEILL 1
 
 /* Define to 1 if you have the <complex.h> header file. */
 #define _GLIBCXX_HAVE_COMPLEX_H 1
 
 /* Define to 1 if you have the `cosf' function. */
-/* #undef _GLIBCXX_HAVE_COSF */
+#define _GLIBCXX_HAVE_COSF 1
 
 /* Define to 1 if you have the `coshf' function. */
-/* #undef _GLIBCXX_HAVE_COSHF */
+#define _GLIBCXX_HAVE_COSHF 1
 
 /* Define to 1 if you have the `coshl' function. */
-/* #undef _GLIBCXX_HAVE_COSHL */
+#define _GLIBCXX_HAVE_COSHL 1
 
 /* Define to 1 if you have the `cosl' function. */
-/* #undef _GLIBCXX_HAVE_COSL */
+#define _GLIBCXX_HAVE_COSL 1
 
 /* Define to 1 if you have the <dirent.h> header file. */
 #define _GLIBCXX_HAVE_DIRENT_H 1
@@ -650,16 +650,16 @@ namespace std
 #define _GLIBCXX_HAVE_EXECINFO_H 1
 
 /* Define to 1 if you have the `expf' function. */
-/* #undef _GLIBCXX_HAVE_EXPF */
+#define _GLIBCXX_HAVE_EXPF 1
 
 /* Define to 1 if you have the `expl' function. */
-/* #undef _GLIBCXX_HAVE_EXPL */
+#define _GLIBCXX_HAVE_EXPL 1
 
 /* Define to 1 if you have the `fabsf' function. */
-/* #undef _GLIBCXX_HAVE_FABSF */
+#define _GLIBCXX_HAVE_FABSF 1
 
 /* Define to 1 if you have the `fabsl' function. */
-/* #undef _GLIBCXX_HAVE_FABSL */
+#define _GLIBCXX_HAVE_FABSL 1
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define _GLIBCXX_HAVE_FCNTL_H 1
@@ -668,10 +668,10 @@ namespace std
 #define _GLIBCXX_HAVE_FENV_H 1
 
 /* Define to 1 if you have the `finite' function. */
-/* #undef _GLIBCXX_HAVE_FINITE */
+#define _GLIBCXX_HAVE_FINITE 1
 
 /* Define to 1 if you have the `finitef' function. */
-/* #undef _GLIBCXX_HAVE_FINITEF */
+#define _GLIBCXX_HAVE_FINITEF 1
 
 /* Define to 1 if you have the `finitel' function. */
 /* #undef _GLIBCXX_HAVE_FINITEL */
@@ -680,16 +680,16 @@ namespace std
 #define _GLIBCXX_HAVE_FLOAT_H 1
 
 /* Define to 1 if you have the `floorf' function. */
-/* #undef _GLIBCXX_HAVE_FLOORF */
+#define _GLIBCXX_HAVE_FLOORF 1
 
 /* Define to 1 if you have the `floorl' function. */
-/* #undef _GLIBCXX_HAVE_FLOORL */
+#define _GLIBCXX_HAVE_FLOORL 1
 
 /* Define to 1 if you have the `fmodf' function. */
-/* #undef _GLIBCXX_HAVE_FMODF */
+#define _GLIBCXX_HAVE_FMODF 1
 
 /* Define to 1 if you have the `fmodl' function. */
-/* #undef _GLIBCXX_HAVE_FMODL */
+#define _GLIBCXX_HAVE_FMODL 1
 
 /* Define to 1 if you have the `fpclass' function. */
 /* #undef _GLIBCXX_HAVE_FPCLASS */
@@ -698,10 +698,10 @@ namespace std
 /* #undef _GLIBCXX_HAVE_FP_H */
 
 /* Define to 1 if you have the `frexpf' function. */
-/* #undef _GLIBCXX_HAVE_FREXPF */
+#define _GLIBCXX_HAVE_FREXPF 1
 
 /* Define to 1 if you have the `frexpl' function. */
-/* #undef _GLIBCXX_HAVE_FREXPL */
+#define _GLIBCXX_HAVE_FREXPL 1
 
 /* Define if _Unwind_GetIPInfo is available. */
 #define _GLIBCXX_HAVE_GETIPINFO 1
@@ -710,13 +710,13 @@ namespace std
 #define _GLIBCXX_HAVE_GETS 1
 
 /* Define to 1 if you have the `hypot' function. */
-/* #undef _GLIBCXX_HAVE_HYPOT */
+#define _GLIBCXX_HAVE_HYPOT 1
 
 /* Define to 1 if you have the `hypotf' function. */
-/* #undef _GLIBCXX_HAVE_HYPOTF */
+#define _GLIBCXX_HAVE_HYPOTF 1
 
 /* Define to 1 if you have the `hypotl' function. */
-/* #undef _GLIBCXX_HAVE_HYPOTL */
+#define _GLIBCXX_HAVE_HYPOTL 1
 
 /* Define if you have the iconv() function. */
 #define _GLIBCXX_HAVE_ICONV 1
@@ -740,7 +740,7 @@ namespace std
 #define _GLIBCXX_HAVE_ISINF 1
 
 /* Define to 1 if you have the `isinff' function. */
-/* #undef _GLIBCXX_HAVE_ISINFF */
+#define _GLIBCXX_HAVE_ISINFF 1
 
 /* Define to 1 if you have the `isinfl' function. */
 /* #undef _GLIBCXX_HAVE_ISINFL */
@@ -749,7 +749,7 @@ namespace std
 #define _GLIBCXX_HAVE_ISNAN 1
 
 /* Define to 1 if you have the `isnanf' function. */
-/* #undef _GLIBCXX_HAVE_ISNANF */
+#define _GLIBCXX_HAVE_ISNANF 1
 
 /* Define to 1 if you have the `isnanl' function. */
 /* #undef _GLIBCXX_HAVE_ISNANL */
@@ -761,10 +761,10 @@ namespace std
 #define _GLIBCXX_HAVE_LC_MESSAGES 1
 
 /* Define to 1 if you have the `ldexpf' function. */
-/* #undef _GLIBCXX_HAVE_LDEXPF */
+#define _GLIBCXX_HAVE_LDEXPF 1
 
 /* Define to 1 if you have the `ldexpl' function. */
-/* #undef _GLIBCXX_HAVE_LDEXPL */
+#define _GLIBCXX_HAVE_LDEXPL 1
 
 /* Define to 1 if you have the <libintl.h> header file. */
 /* #undef _GLIBCXX_HAVE_LIBINTL_H */
@@ -791,16 +791,16 @@ namespace std
 #define _GLIBCXX_HAVE_LOCALE_H 1
 
 /* Define to 1 if you have the `log10f' function. */
-/* #undef _GLIBCXX_HAVE_LOG10F */
+#define _GLIBCXX_HAVE_LOG10F 1
 
 /* Define to 1 if you have the `log10l' function. */
-/* #undef _GLIBCXX_HAVE_LOG10L */
+#define _GLIBCXX_HAVE_LOG10L 1
 
 /* Define to 1 if you have the `logf' function. */
-/* #undef _GLIBCXX_HAVE_LOGF */
+#define _GLIBCXX_HAVE_LOGF 1
 
 /* Define to 1 if you have the `logl' function. */
-/* #undef _GLIBCXX_HAVE_LOGL */
+#define _GLIBCXX_HAVE_LOGL 1
 
 /* Define to 1 if you have the <machine/endian.h> header file. */
 #define _GLIBCXX_HAVE_MACHINE_ENDIAN_H 1
@@ -818,22 +818,22 @@ namespace std
 #define _GLIBCXX_HAVE_MODF 1
 
 /* Define to 1 if you have the `modff' function. */
-/* #undef _GLIBCXX_HAVE_MODFF */
+#define _GLIBCXX_HAVE_MODFF 1
 
 /* Define to 1 if you have the `modfl' function. */
-/* #undef _GLIBCXX_HAVE_MODFL */
+#define _GLIBCXX_HAVE_MODFL 1
 
 /* Define to 1 if you have the <nan.h> header file. */
 /* #undef _GLIBCXX_HAVE_NAN_H */
 
 /* Define if poll is available in <poll.h>. */
-/* #undef _GLIBCXX_HAVE_POLL */
+#define _GLIBCXX_HAVE_POLL 1
 
 /* Define to 1 if you have the `powf' function. */
-/* #undef _GLIBCXX_HAVE_POWF */
+#define _GLIBCXX_HAVE_POWF 1
 
 /* Define to 1 if you have the `powl' function. */
-/* #undef _GLIBCXX_HAVE_POWL */
+#define _GLIBCXX_HAVE_POWL 1
 
 /* Define to 1 if you have the `qfpclass' function. */
 /* #undef _GLIBCXX_HAVE_QFPCLASS */
@@ -854,25 +854,25 @@ namespace std
 /* #undef _GLIBCXX_HAVE_SINCOSL */
 
 /* Define to 1 if you have the `sinf' function. */
-/* #undef _GLIBCXX_HAVE_SINF */
+#define _GLIBCXX_HAVE_SINF 1
 
 /* Define to 1 if you have the `sinhf' function. */
-/* #undef _GLIBCXX_HAVE_SINHF */
+#define _GLIBCXX_HAVE_SINHF 1
 
 /* Define to 1 if you have the `sinhl' function. */
-/* #undef _GLIBCXX_HAVE_SINHL */
+#define _GLIBCXX_HAVE_SINHL 1
 
 /* Define to 1 if you have the `sinl' function. */
-/* #undef _GLIBCXX_HAVE_SINL */
+#define _GLIBCXX_HAVE_SINL 1
 
 /* Defined if sleep exists. */
-#define _GLIBCXX_HAVE_SLEEP 1
+/* #undef _GLIBCXX_HAVE_SLEEP */
 
 /* Define to 1 if you have the `sqrtf' function. */
-/* #undef _GLIBCXX_HAVE_SQRTF */
+#define _GLIBCXX_HAVE_SQRTF 1
 
 /* Define to 1 if you have the `sqrtl' function. */
-/* #undef _GLIBCXX_HAVE_SQRTL */
+#define _GLIBCXX_HAVE_SQRTL 1
 
 /* Define to 1 if you have the <stdalign.h> header file. */
 /* #undef _GLIBCXX_HAVE_STDALIGN_H */
@@ -905,7 +905,7 @@ namespace std
 #define _GLIBCXX_HAVE_STRTOLD 1
 
 /* Define to 1 if `d_type' is a member of `struct dirent'. */
-/* #undef _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE */
+#define _GLIBCXX_HAVE_STRUCT_DIRENT_D_TYPE 1
 
 /* Define if strxfrm_l is available in <string.h>. */
 /* #undef _GLIBCXX_HAVE_STRXFRM_L */
@@ -963,19 +963,19 @@ namespace std
 /* #undef _GLIBCXX_HAVE_S_IFREG */
 
 /* Define if S_IFREG is available in <sys/stat.h>. */
-/* #undef _GLIBCXX_HAVE_S_ISREG */
+#define _GLIBCXX_HAVE_S_ISREG 1
 
 /* Define to 1 if you have the `tanf' function. */
-/* #undef _GLIBCXX_HAVE_TANF */
+#define _GLIBCXX_HAVE_TANF 1
 
 /* Define to 1 if you have the `tanhf' function. */
-/* #undef _GLIBCXX_HAVE_TANHF */
+#define _GLIBCXX_HAVE_TANHF 1
 
 /* Define to 1 if you have the `tanhl' function. */
-/* #undef _GLIBCXX_HAVE_TANHL */
+#define _GLIBCXX_HAVE_TANHL 1
 
 /* Define to 1 if you have the `tanl' function. */
-/* #undef _GLIBCXX_HAVE_TANL */
+#define _GLIBCXX_HAVE_TANL 1
 
 /* Define to 1 if you have the <tgmath.h> header file. */
 #define _GLIBCXX_HAVE_TGMATH_H 1
@@ -987,7 +987,7 @@ namespace std
 #define _GLIBCXX_HAVE_UNISTD_H 1
 
 /* Defined if usleep exists. */
-#define _GLIBCXX_HAVE_USLEEP 1
+/* #undef _GLIBCXX_HAVE_USLEEP */
 
 /* Define to 1 if you have the <utime.h> header file. */
 #define _GLIBCXX_HAVE_UTIME_H 1
@@ -1014,7 +1014,7 @@ namespace std
 /* #undef _GLIBCXX_HAVE_WIN32_SLEEP */
 
 /* Define if writev is available in <sys/uio.h>. */
-/* #undef _GLIBCXX_HAVE_WRITEV */
+#define _GLIBCXX_HAVE_WRITEV 1
 
 /* Define to 1 if you have the `_acosf' function. */
 /* #undef _GLIBCXX_HAVE__ACOSF */
@@ -1355,26 +1355,26 @@ namespace std
 /* #undef _GLIBCXX_USE_CLOCK_GETTIME_SYSCALL */
 
 /* Defined if clock_gettime has monotonic clock support. */
-/* #undef _GLIBCXX_USE_CLOCK_MONOTONIC */
+#define _GLIBCXX_USE_CLOCK_MONOTONIC 1
 
 /* Defined if clock_gettime has realtime clock support. */
-/* #undef _GLIBCXX_USE_CLOCK_REALTIME */
+#define _GLIBCXX_USE_CLOCK_REALTIME 1
 
 /* Define if ISO/IEC TR 24733 decimal floating point types are supported on
    this host. */
 /* #undef _GLIBCXX_USE_DECIMAL_FLOAT */
 
 /* Define if fchmod is available in <sys/stat.h>. */
-/* #undef _GLIBCXX_USE_FCHMOD */
+#define _GLIBCXX_USE_FCHMOD 1
 
 /* Define if fchmodat is available in <sys/stat.h>. */
-/* #undef _GLIBCXX_USE_FCHMODAT */
+#define _GLIBCXX_USE_FCHMODAT 1
 
 /* Define if __float128 is supported on this host. */
 #define _GLIBCXX_USE_FLOAT128 1
 
 /* Defined if gettimeofday is available. */
-/* #undef _GLIBCXX_USE_GETTIMEOFDAY */
+#define _GLIBCXX_USE_GETTIMEOFDAY 1
 
 /* Define if get_nprocs is available in <sys/sysinfo.h>. */
 /* #undef _GLIBCXX_USE_GET_NPROCS */
@@ -1389,7 +1389,7 @@ namespace std
 #define _GLIBCXX_USE_LONG_LONG 1
 
 /* Defined if nanosleep is available. */
-/* #undef _GLIBCXX_USE_NANOSLEEP */
+#define _GLIBCXX_USE_NANOSLEEP 1
 
 /* Define if NLS translations are to be used. */
 /* #undef _GLIBCXX_USE_NLS */
@@ -1411,7 +1411,7 @@ namespace std
 #define _GLIBCXX_USE_SCHED_YIELD 1
 
 /* Define if _SC_NPROCESSORS_ONLN is available in <unistd.h>. */
-/* #undef _GLIBCXX_USE_SC_NPROCESSORS_ONLN */
+#define _GLIBCXX_USE_SC_NPROCESSORS_ONLN 1
 
 /* Define if _SC_NPROC_ONLN is available in <unistd.h>. */
 /* #undef _GLIBCXX_USE_SC_NPROC_ONLN */
@@ -1420,17 +1420,17 @@ namespace std
 /* #undef _GLIBCXX_USE_SENDFILE */
 
 /* Define if struct stat has timespec members. */
-/* #undef _GLIBCXX_USE_ST_MTIM */
+#define _GLIBCXX_USE_ST_MTIM 1
 
 /* Define if sysctl(), CTL_HW and HW_NCPU are available in <sys/sysctl.h>. */
-/* #undef _GLIBCXX_USE_SYSCTL_HW_NCPU */
+#define _GLIBCXX_USE_SYSCTL_HW_NCPU 1
 
 /* Define if obsolescent tmpnam is available in <stdio.h>. */
-/* #undef _GLIBCXX_USE_TMPNAM */
+#define _GLIBCXX_USE_TMPNAM 1
 
 /* Define if utimensat and UTIME_OMIT are available in <sys/stat.h> and
    AT_FDCWD in <fcntl.h>. */
-/* #undef _GLIBCXX_USE_UTIMENSAT */
+#define _GLIBCXX_USE_UTIMENSAT 1
 
 /* Define if code specialized for wchar_t should be used. */
 #define _GLIBCXX_USE_WCHAR_T 1

Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.27 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.28
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.27	Wed Mar 16 05:33:50 2016
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Wed Mar 16 10:56:20 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2016/03/16 05:33:50 mrg Exp $
+#	$NetBSD: Makefile,v 1.28 2016/03/16 10:56:20 mrg Exp $
 
 LIBISPRIVATE=	yes
 
@@ -139,9 +139,14 @@ gtyp-gen.h: Makefile
 insn-modes.c: genmodes
 	${_MKTARGET_CREATE}
 	./genmodes >${.TARGET}
-insn-modes.h: genmodes
+insn-modes.h-test: genmodes
 	${_MKTARGET_CREATE}
 	./genmodes -h >${.TARGET}
+	# Ensure that the checked in version matches
+	if ! cmp ${.TARGET} ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/insn-modes.h; then
+		echo "Checked in insn-modes.h does not match; rerun mknative-gcc." 1>&2
+		false
+	fi
 min-insn-modes.c: genmodes
 	${_MKTARGET_CREATE}
 	./genmodes -m >${.TARGET}
@@ -150,7 +155,7 @@ genmodes: genmodes.lo build-errors.lo
 	${_MKTARGET_LINK}
 	${HOST_LINK.cc} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
 
-CLEANFILES+=	genmodes insn-modes.c insn-modes.h min-insn-modes.c
+CLEANFILES+=	genmodes insn-modes.c insn-modes.h-test min-insn-modes.c
 
 gimple-match.c: genmatch
 	./genmatch --gimple ${GNUHOSTDIST}/gcc/match.pd > gimple-match.c.tmp

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h:1.7 src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h:1.8
--- src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h:1.7	Tue Mar 15 19:18:00 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h	Wed Mar 16 10:56:20 2016
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.84 2016/03/15 06:10:13 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.85 2016/03/15 21:38:32 mrg Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 /* auto-host.h.  Generated from config.in by configure.  */

Index: src/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h
diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h:1.23 src/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h:1.24
--- src/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h:1.23	Tue Mar 15 21:43:25 2016
+++ src/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h	Wed Mar 16 10:56:20 2016
@@ -1,9 +1,9 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.84 2016/03/15 06:10:13 mrg Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.85 2016/03/15 21:38:32 mrg Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 /* Generated automatically. */
-static const char configuration_arguments[] = "/usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=i486--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb3 20151015' --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-threads --with-arch=i486 --with-tune=nocona --enable-libstdcxx-time=rt --with-mpc-lib=/var/obj/i386/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/i386/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/i386/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/i386 --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd7.0. --host=i486--netbsdelf --with-sysroot=/var/obj/i386/usr/src/destdir.i386 : (reconfigured) /usr/src/tools/gcc/../
 ../external/gpl3/gcc/dist/configure --target=i486--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb3 20151015' --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-threads --with-arch=i486 --with-tune=nocona --enable-libstdcxx-time=rt --with-mpc-lib=/var/obj/i386/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/i386/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/i386/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/i386 --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd7.0. --host=i486--netbsdelf --with-sysroot=/var/obj/i386/usr/src/destdir.i386 : (reconfigured) /usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=i486--netbsdelf --enable
 -long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb3 20151015' --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-threads --with-arch=i486 --with-tune=nocona --enable-libstdcxx-time=rt --with-mpc-lib=/var/obj/i386/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/i386/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/i386/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/i386 --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd7.0. --host=i486--netbsdelf --with-sysroot=/var/obj/i386/usr/src/destdir.i386 : (reconfigured) /usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=i486--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/
 send-pr.html --with-pkgversion='NetBSD nb3 20151015' --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-threads --with-arch=i486 --with-tune=nocona --enable-libstdcxx-time=rt --with-mpc-lib=/var/obj/i386/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/i386/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/i386/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/i386 --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd7.0. --host=i486--netbsdelf --with-sysroot=/var/obj/i386/usr/src/destdir.i386 : (reconfigured) /usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=i486--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb3 20151015' --with-system-zl
 ib --enable-__cxa_atexit --enable-libstdcxx-threads --with-arch=i486 --with-tune=nocona --enable-libstdcxx-time=rt --with-mpc-lib=/var/obj/i386/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/i386/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/i386/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/i386 --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd7.0. --host=i486--netbsdelf --with-sysroot=/var/obj/i386/usr/src/destdir.i386 : (reconfigured) /usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=i486--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb3 20151015' --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-threads --with-arch=i486 
 --with-tune=nocona --enable-libstdcxx-time=rt --with-mpc-lib=/var/obj/i386/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/i386/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/i386/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/i386 --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd7.0. --host=i486--netbsdelf --with-sysroot=/var/obj/i386/usr/src/destdir.i386";
+static const char configuration_arguments[] = "/usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=i486--netbsdelf --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb3 20151015' --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-threads --with-arch=i486 --with-tune=nocona --enable-libstdcxx-time=rt --with-mpc-lib=/var/obj/mknative/i386/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/i386/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/i386/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/i386 --enable-tls --disable-multilib --disable-symvers --disable-libstdcxx-pch --build=x86_64-unknown-netbsd7.0. --host=i486--netbsdelf --with-sysroot=/var/obj/mknative/i386/usr/src/destdir.i386";
 static const char thread_model[] = "posix";
 
 static const struct {

Reply via email to