Module Name:    src
Committed By:   tls
Date:           Sun Aug 10 07:11:11 UTC 2014

Modified Files:
        src/external/gpl3/gcc.old [tls-earlyentropy]: Makefile.gcc_path
        src/external/gpl3/gcc.old/dist [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/dist/fixincludes [tls-earlyentropy]:
            configure
        src/external/gpl3/gcc.old/dist/gcc [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/dist/gcc/config/m68k [tls-earlyentropy]:
            t-floatlib
        src/external/gpl3/gcc.old/dist/intl [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/dist/libcpp [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/dist/libdecnumber [tls-earlyentropy]:
            configure
        src/external/gpl3/gcc.old/dist/libgcc [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/dist/libgomp [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/dist/libiberty [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/dist/libmudflap [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/dist/libobjc [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/dist/libssp [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/dist/libstdc++-v3 [tls-earlyentropy]:
            configure
        src/external/gpl3/gcc.old/dist/lto-plugin [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/dist/zlib [tls-earlyentropy]: configure
        src/external/gpl3/gcc.old/lib/libgcc/arch [tls-earlyentropy]: m68k.mk
        src/external/gpl3/gcc.old/lib/libstdc++-v3 [tls-earlyentropy]: Makefile
        src/external/gpl3/gcc.old/usr.bin [tls-earlyentropy]: Makefile.inc

Log Message:
Rebase.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/Makefile.gcc_path
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 src/external/gpl3/gcc.old/dist/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/fixincludes/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/gcc/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/gcc/config/m68k/t-floatlib
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/intl/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/libcpp/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/libdecnumber/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/libgcc/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/libgomp/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/libiberty/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/libmudflap/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/libobjc/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/libssp/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/libstdc++-v3/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/lto-plugin/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/dist/zlib/configure
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
    src/external/gpl3/gcc.old/lib/libgcc/arch/m68k.mk
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
    src/external/gpl3/gcc.old/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
    src/external/gpl3/gcc.old/usr.bin/Makefile.inc

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.old/Makefile.gcc_path
diff -u src/external/gpl3/gcc.old/Makefile.gcc_path:1.1.1.1 src/external/gpl3/gcc.old/Makefile.gcc_path:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/Makefile.gcc_path:1.1.1.1	Wed Feb 26 10:56:10 2014
+++ src/external/gpl3/gcc.old/Makefile.gcc_path	Sun Aug 10 07:11:10 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.gcc_path,v 1.1.1.1 2014/02/26 10:56:10 mrg Exp $
+#	$NetBSD: Makefile.gcc_path,v 1.1.1.1.2.1 2014/08/10 07:11:10 tls Exp $
 
 # Define some commom paths
 
@@ -7,11 +7,7 @@ _EXTERNAL_GPL3_GCC_MAKEFILE_INC_=1
 
 .include <bsd.own.mk>
 
-.if ${HAVE_GCC} >= 45
 GCC_SUBDIR=	${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_GCC_SUBDIR}
-.else
-GCC_SUBDIR=	/not/here/for/you
-.endif
 
 #.if exists(${GCC_SUBDIR}/dist)
 GCCDIST=	${GCC_SUBDIR}/dist

Index: src/external/gpl3/gcc.old/dist/configure
diff -u src/external/gpl3/gcc.old/dist/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/configure:1.1.1.1	Tue Feb 25 18:38:34 2014
+++ src/external/gpl3/gcc.old/dist/configure	Sun Aug 10 07:11:10 2014
@@ -2404,7 +2404,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/fixincludes/configure
diff -u src/external/gpl3/gcc.old/dist/fixincludes/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/fixincludes/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/fixincludes/configure:1.1.1.1	Tue Feb 25 18:40:30 2014
+++ src/external/gpl3/gcc.old/dist/fixincludes/configure	Sun Aug 10 07:11:10 2014
@@ -2135,7 +2135,7 @@ for ac_dir in .. "$srcdir"/..; do
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/gcc/configure
diff -u src/external/gpl3/gcc.old/dist/gcc/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/gcc/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/gcc/configure:1.1.1.1	Tue Feb 25 18:38:35 2014
+++ src/external/gpl3/gcc.old/dist/gcc/configure	Sun Aug 10 07:11:10 2014
@@ -2978,7 +2978,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/gcc/config/m68k/t-floatlib
diff -u src/external/gpl3/gcc.old/dist/gcc/config/m68k/t-floatlib:1.1.1.1 src/external/gpl3/gcc.old/dist/gcc/config/m68k/t-floatlib:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/gcc/config/m68k/t-floatlib:1.1.1.1	Tue Feb 25 18:39:02 2014
+++ src/external/gpl3/gcc.old/dist/gcc/config/m68k/t-floatlib	Sun Aug 10 07:11:10 2014
@@ -18,7 +18,7 @@
 
 LIB1ASMSRC = m68k/lb1sf68.asm
 LIB1ASMFUNCS = _mulsi3 _udivsi3 _divsi3 _umodsi3 _modsi3 \
-   _double _float _floatex \
+   _floatex _float _double \
    _eqdf2 _nedf2 _gtdf2 _gedf2 _ltdf2 _ledf2 \
    _eqsf2 _nesf2 _gtsf2 _gesf2 _ltsf2 _lesf2
 

Index: src/external/gpl3/gcc.old/dist/intl/configure
diff -u src/external/gpl3/gcc.old/dist/intl/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/intl/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/intl/configure:1.1.1.1	Tue Feb 25 18:40:33 2014
+++ src/external/gpl3/gcc.old/dist/intl/configure	Sun Aug 10 07:11:10 2014
@@ -2212,7 +2212,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/libcpp/configure
diff -u src/external/gpl3/gcc.old/dist/libcpp/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/libcpp/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/libcpp/configure:1.1.1.1	Tue Feb 25 18:40:35 2014
+++ src/external/gpl3/gcc.old/dist/libcpp/configure	Sun Aug 10 07:11:10 2014
@@ -2632,7 +2632,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/libdecnumber/configure
diff -u src/external/gpl3/gcc.old/dist/libdecnumber/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/libdecnumber/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/libdecnumber/configure:1.1.1.1	Tue Feb 25 18:40:39 2014
+++ src/external/gpl3/gcc.old/dist/libdecnumber/configure	Sun Aug 10 07:11:10 2014
@@ -4459,7 +4459,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/libgcc/configure
diff -u src/external/gpl3/gcc.old/dist/libgcc/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/libgcc/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/libgcc/configure:1.1.1.1	Tue Feb 25 18:38:34 2014
+++ src/external/gpl3/gcc.old/dist/libgcc/configure	Sun Aug 10 07:11:10 2014
@@ -1855,7 +1855,7 @@ for ac_dir in $libgcc_topdir "$srcdir"/$
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/libgomp/configure
diff -u src/external/gpl3/gcc.old/dist/libgomp/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/libgomp/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/libgomp/configure:1.1.1.1	Tue Feb 25 18:40:44 2014
+++ src/external/gpl3/gcc.old/dist/libgomp/configure	Sun Aug 10 07:11:10 2014
@@ -2615,7 +2615,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/libiberty/configure
diff -u src/external/gpl3/gcc.old/dist/libiberty/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/libiberty/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/libiberty/configure:1.1.1.1	Tue Feb 25 18:40:46 2014
+++ src/external/gpl3/gcc.old/dist/libiberty/configure	Sun Aug 10 07:11:10 2014
@@ -2345,7 +2345,7 @@ for ac_dir in $libiberty_topdir "$srcdir
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/libmudflap/configure
diff -u src/external/gpl3/gcc.old/dist/libmudflap/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/libmudflap/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/libmudflap/configure:1.1.1.1	Tue Feb 25 18:40:52 2014
+++ src/external/gpl3/gcc.old/dist/libmudflap/configure	Sun Aug 10 07:11:11 2014
@@ -2182,7 +2182,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/libobjc/configure
diff -u src/external/gpl3/gcc.old/dist/libobjc/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/libobjc/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/libobjc/configure:1.1.1.1	Tue Feb 25 18:40:55 2014
+++ src/external/gpl3/gcc.old/dist/libobjc/configure	Sun Aug 10 07:11:11 2014
@@ -2165,7 +2165,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/libssp/configure
diff -u src/external/gpl3/gcc.old/dist/libssp/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/libssp/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/libssp/configure:1.1.1.1	Tue Feb 25 18:40:58 2014
+++ src/external/gpl3/gcc.old/dist/libssp/configure	Sun Aug 10 07:11:11 2014
@@ -2180,7 +2180,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/libstdc++-v3/configure
diff -u src/external/gpl3/gcc.old/dist/libstdc++-v3/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/libstdc++-v3/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/libstdc++-v3/configure:1.1.1.1	Tue Feb 25 18:41:00 2014
+++ src/external/gpl3/gcc.old/dist/libstdc++-v3/configure	Sun Aug 10 07:11:11 2014
@@ -2850,7 +2850,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/lto-plugin/configure
diff -u src/external/gpl3/gcc.old/dist/lto-plugin/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/lto-plugin/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/lto-plugin/configure:1.1.1.1	Tue Feb 25 18:41:57 2014
+++ src/external/gpl3/gcc.old/dist/lto-plugin/configure	Sun Aug 10 07:11:11 2014
@@ -2141,7 +2141,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/dist/zlib/configure
diff -u src/external/gpl3/gcc.old/dist/zlib/configure:1.1.1.1 src/external/gpl3/gcc.old/dist/zlib/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/dist/zlib/configure:1.1.1.1	Tue Feb 25 18:41:59 2014
+++ src/external/gpl3/gcc.old/dist/zlib/configure	Sun Aug 10 07:11:11 2014
@@ -2221,7 +2221,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
   for ac_t in install-sh install.sh shtool; do
     if test -f "$ac_dir/$ac_t"; then
       ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
       break 2
     fi
   done

Index: src/external/gpl3/gcc.old/lib/libgcc/arch/m68k.mk
diff -u src/external/gpl3/gcc.old/lib/libgcc/arch/m68k.mk:1.1.1.1 src/external/gpl3/gcc.old/lib/libgcc/arch/m68k.mk:1.1.1.1.2.1
--- src/external/gpl3/gcc.old/lib/libgcc/arch/m68k.mk:1.1.1.1	Tue Feb 25 18:42:04 2014
+++ src/external/gpl3/gcc.old/lib/libgcc/arch/m68k.mk	Sun Aug 10 07:11:11 2014
@@ -6,7 +6,7 @@ G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc 
 G_LIB2ADD=fpgnulib.c xfgnulib.c
 G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-glibc.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
 G_LIB2ADD_ST=
-G_LIB1ASMFUNCS=_mulsi3 _udivsi3 _divsi3 _umodsi3 _modsi3 _double _float _floatex _eqdf2 _nedf2 _gtdf2 _gedf2 _ltdf2 _ledf2 _eqsf2 _nesf2 _gtsf2 _gesf2 _ltsf2 _lesf2
+G_LIB1ASMFUNCS=_mulsi3 _udivsi3 _divsi3 _umodsi3 _modsi3 _floatex _float _double _eqdf2 _nedf2 _gtdf2 _gedf2 _ltdf2 _ledf2 _eqsf2 _nesf2 _gtsf2 _gesf2 _ltsf2 _lesf2
 G_LIB1ASMSRC=m68k/lb1sf68.asm
 G_LIB2_DIVMOD_FUNCS=_divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
 G_LIB2FUNCS_ST=_eprintf __gcc_bcmp

Index: src/external/gpl3/gcc.old/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc.old/lib/libstdc++-v3/Makefile:1.1.1.2 src/external/gpl3/gcc.old/lib/libstdc++-v3/Makefile:1.1.1.2.2.1
--- src/external/gpl3/gcc.old/lib/libstdc++-v3/Makefile:1.1.1.2	Wed Feb 26 10:57:31 2014
+++ src/external/gpl3/gcc.old/lib/libstdc++-v3/Makefile	Sun Aug 10 07:11:11 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.2 2014/02/26 10:57:31 mrg Exp $
+#	$NetBSD: Makefile,v 1.1.1.2.2.1 2014/08/10 07:11:11 tls Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -52,8 +52,6 @@ COPTS.wlocale-inst.cc = -Wno-stack-prote
 COPTS.concept-inst.cc=	-D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates
 CPPFLAGS.strstream.cc=	-I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated
 
-# For GCC 4.5
-.if ${HAVE_GCC} >= 45
 # XXX also need this for some PCHs.
 CPPFLAGS.atomic.cc = -std=gnu++0x
 CPPFLAGS.compatibility-c++0x.cc = -std=gnu++0x
@@ -76,7 +74,6 @@ CPPFLAGS.concept-inst.cc += -D_GLIBCXX_C
 CPPFLAGS.parallel_list.cc += -D_GLIBCXX_PARALLEL
 CPPFLAGS.parallel_settings.cc += -D_GLIBCXX_PARALLEL
 CPPFLAGS.compatibility-parallel_list.cc += -D_GLIBCXX_PARALLEL
-.endif
 
 # XXX
 MKDEPFLAGS+=	-I$(GLIBCPP_INCLUDE_DIR)/backward

Index: src/external/gpl3/gcc.old/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.1.1.2 src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.1.1.2.2.1
--- src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.1.1.2	Wed Feb 26 10:57:34 2014
+++ src/external/gpl3/gcc.old/usr.bin/Makefile.inc	Sun Aug 10 07:11:11 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.1.1.2 2014/02/26 10:57:34 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.1.1.2.2.1 2014/08/10 07:11:11 tls Exp $
 
 .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
 _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -66,7 +66,7 @@ DATESTAMPSTR=		"\"\""
 .endif
 
 # XXX pull this out of our configs
-G_BUGURL=<http://www.NetBSD.org/Misc/send-pr.html>
+G_BUGURL=<http://www.NetBSD.org/support/send-pr.html>
 G_BUGURL_s="\"${G_BUG_URL}\""
 G_PKGVERSION=(NetBSD nb1 20120916) 
 G_PKGVERSION_s="\"${G_PKGVERSION} \""

Reply via email to