Module Name: src
Committed By: mrg
Date: Thu Mar 17 23:41:21 UTC 2016
Modified Files:
src/tools/gcc: gcc-version.mk mknative-gcc
Log Message:
set NETBSD_GCC_VERSION for GCC 5.3 separately.
don't collect crtstuff anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tools/gcc/gcc-version.mk
cvs rdiff -u -r1.86 -r1.87 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/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.4 src/tools/gcc/gcc-version.mk:1.5
--- src/tools/gcc/gcc-version.mk:1.4 Fri Oct 16 00:41:07 2015
+++ src/tools/gcc/gcc-version.mk Thu Mar 17 23:41:21 2016
@@ -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
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.86 src/tools/gcc/mknative-gcc:1.87
--- src/tools/gcc/mknative-gcc:1.86 Wed Mar 16 11:16:05 2016
+++ src/tools/gcc/mknative-gcc Thu Mar 17 23:41:21 2016
@@ -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 @@ sanitise_includes () {
-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 @@ case "$1" in
libgcc*-bootstrap)
get_libgcc gcc
get_libgcov gcc $_PLATFORM/libgcc/Makefile
- get_crtstuff crtstuff
get_gcc_bootstrap gcc
exit 0
;;
@@ -428,7 +414,6 @@ gcc*)
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
