[src/trunk]: src/tools/gcc two fixes skrll@ pointed out:

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

details:   https://anonhg.NetBSD.org/src/rev/ec580cc9de88
branches:  trunk
changeset: 329522:ec580cc9de88
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed May 28 07:32:22 2014 +0000

description:
two fixes skrll@ pointed out:
- pass --enable-libstdcxx-threads to enable a bunch of tests and thus
  get the right answers
- MKNATIVE_CONFIG_TARGET_LIBS needs to do libgcc before libstdc++-v3,
  for the GCC 4.8 case.

with these we now get the right threading options in the headers.

diffstat:

 tools/gcc/Makefile |  21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diffs (51 lines):

diff -r 542fb99cf9de -r ec580cc9de88 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Wed May 28 07:03:27 2014 +0000
+++ b/tools/gcc/Makefile        Wed May 28 07:32:22 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.67 2014/05/27 09:19:30 skrll Exp $
+#      $NetBSD: Makefile,v 1.68 2014/05/28 07:32:22 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -41,7 +41,8 @@
                        --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
                        --with-pkgversion="NetBSD nb1 20140527" \
                        --with-system-zlib \
-                       --enable-__cxa_atexit
+                       --enable-__cxa_atexit \
+                       --enable-libstdcxx-threads
 .if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
 COMMON_CONFIGURE_ARGS+=        --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
 .endif
@@ -85,23 +86,23 @@
 # mknative-gcc specific stuff
 #
 
-MKNATIVE_CONFIG_TARGET_LIBS= \
-       configure-target-libstdc++-v3 \
-       configure-target-libobjc
+MKNATIVE_CONFIG_TARGET_LIBS=
 
 .if ${HAVE_GCC} == 48
-MKNATIVE_CONFIG_TARGET_LIBS += configure-target-libgcc
+MKNATIVE_CONFIG_TARGET_LIBS+=  configure-target-libgcc
+MKNATIVE_CONFIG_TARGET_LIBS+=  configure-target-libgomp
 MKNATIVE_TARGET=       gcc48
-MKNATIVE_CONFIG_TARGET_LIBS+= \
-       configure-target-libgomp
 .elif ${HAVE_GCC} == 45
+MKNATIVE_CONFIG_TARGET_LIBS+=  configure-target-libgomp
 MKNATIVE_TARGET=       gcc45
-MKNATIVE_CONFIG_TARGET_LIBS+= \
-       configure-target-libgomp
 .else
 MKNATIVE_TARGET=       gcc4
 .endif
 
+MKNATIVE_CONFIG_TARGET_LIBS+= \
+       configure-target-libstdc++-v3 \
+       configure-target-libobjc
+
 BINENV=                /usr/bin/env -i