Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tools/gcc set NETBSD_GCC_VERSION for GCC 5.3 separately.



details:   https://anonhg.NetBSD.org/src/rev/7234b820c8fb
branches:  trunk
changeset: 344245:7234b820c8fb
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Mar 17 23:41:21 2016 +0000

description:
set NETBSD_GCC_VERSION for GCC 5.3 separately.
don't collect crtstuff anymore.

diffstat:

 tools/gcc/gcc-version.mk |   6 +++++-
 tools/gcc/mknative-gcc   |  17 +----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diffs (60 lines):

diff -r 3b01a50fbc79 -r 7234b820c8fb tools/gcc/gcc-version.mk
--- a/tools/gcc/gcc-version.mk  Thu Mar 17 23:40:10 2016 +0000
+++ b/tools/gcc/gcc-version.mk  Thu Mar 17 23:41:21 2016 +0000
@@ -1,5 +1,9 @@
-#      $NetBSD: gcc-version.mk,v 1.4 2015/10/16 00:41:07 christos Exp $
+#      $NetBSD: gcc-version.mk,v 1.5 2016/03/17 23:41:21 mrg Exp $
 
 # common location for tools and native build
 
+.if ${HAVE_GCC} == 48
 NETBSD_GCC_VERSION=nb3 20151015
+.else
+NETBSD_GCC_VERSION=nb1 20160317
+.endif
diff -r 3b01a50fbc79 -r 7234b820c8fb tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Thu Mar 17 23:40:10 2016 +0000
+++ b/tools/gcc/mknative-gcc    Thu Mar 17 23:41:21 2016 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.86 2016/03/16 11:16:05 mrg Exp $
+#      $NetBSD: mknative-gcc,v 1.87 2016/03/17 23:41:21 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -37,19 +37,6 @@
                -e "s,-I/usr/include/[^         ]*,,"
 }
 
-##### lib/crtstuff #####
-
-get_crtstuff () {
-       _subdir="$1"
-       mkdir -p $_OUTDIR/lib/$_subdir/arch
-
-       getvars gcc/Makefile \
-               INCLUDES CRTSTUFF_CFLAGS CRTSTUFF_T_CFLAGS CRTSTUFF_T_CFLAGS_S \
-               tm_defines xm_file xm_defines \
-               | sanitise_includes \
-               | write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH.mk
-}
-
 ##### lib/libg2c #####
 
 get_libg2c () {
@@ -414,7 +401,6 @@
 libgcc*-bootstrap)
        get_libgcc gcc
        get_libgcov gcc $_PLATFORM/libgcc/Makefile
-       get_crtstuff crtstuff
        get_gcc_bootstrap gcc
        exit 0
        ;;
@@ -428,7 +414,6 @@
        get_gcc gcc
        get_libgcc gcc
        get_libgcov gcc $_PLATFORM/libgcc/Makefile
-       get_crtstuff crtstuff
        get_gcc_bootstrap gcc
        get_gcc_libiberty gcc
        get_libobjc libobjc



Home | Main Index | Thread Index | Old Index