Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src fix MKGCCCMDS=no, and turn it on by default for sun2.
details: https://anonhg.NetBSD.org/src/rev/4db4c4d37faf
branches: trunk
changeset: 805524:4db4c4d37faf
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Jan 05 01:52:23 2015 +0000
description:
fix MKGCCCMDS=no, and turn it on by default for sun2.
diffstat:
distrib/sets/lists/comp/mi | 16 ++++++++--------
distrib/sets/lists/tests/mi | 4 ++--
external/gpl3/Makefile | 4 +---
external/gpl3/gcc.old/Makefile | 10 ++++++++--
external/gpl3/gcc/Makefile | 10 ++++++++--
external/gpl3/gcc/lib/libmudflap/Makefile | 5 ++++-
share/mk/bsd.own.mk | 8 +++++++-
7 files changed, 38 insertions(+), 19 deletions(-)
diffs (159 lines):
diff -r 7f5845d777cf -r 4db4c4d37faf distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Mon Jan 05 01:36:36 2015 +0000
+++ b/distrib/sets/lists/comp/mi Mon Jan 05 01:52:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1931 2014/12/28 05:10:06 nonaka Exp $
+# $NetBSD: mi,v 1.1932 2015/01/05 01:52:23 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3584,10 +3584,10 @@
./usr/lib/libg2c.a comp-obsolete gcc=4,obsolete
./usr/lib/libg2c_p.a comp-fortran-proflib gcc=3,profile
./usr/lib/libg2c_p.a comp-obsolete gcc=4,obsolete
-./usr/lib/libgcc.a comp-c-lib gcccmds
+./usr/lib/libgcc.a comp-c-lib
./usr/lib/libgcc_p.a comp-c-proflib obsolete
./usr/lib/libgcc_s.a comp-obsolete obsolete
-./usr/lib/libgcov.a comp-c-lib gcccmds
+./usr/lib/libgcov.a comp-c-lib
./usr/lib/libgmp.a -unknown- obsolete
./usr/lib/libgmp.a comp-c-lib obsolete
./usr/lib/libgmp_p.a comp-c-proflib obsolete
@@ -3696,8 +3696,8 @@
./usr/lib/libntp_p.a comp-obsolete obsolete
./usr/lib/libnvpair.a comp-zfs-lib zfs
./usr/lib/libnvpair_p.a comp-zfs-proflib profile,zfs
-./usr/lib/libobjc.a comp-objc-lib gcccmds
-./usr/lib/libobjc_p.a comp-objc-proflib profile,gcccmds
+./usr/lib/libobjc.a comp-objc-lib
+./usr/lib/libobjc_p.a comp-objc-proflib profile
./usr/lib/libopenpgpsdk.a comp-obsolete obsolete
./usr/lib/libopenpgpsdk_p.a comp-obsolete obsolete
./usr/lib/libossaudio.a comp-c-lib
@@ -3931,9 +3931,9 @@
./usr/lib/libssl_p.a comp-c-proflib profile,crypto
./usr/lib/libssp.a comp-obsolete obsolete
./usr/lib/libssp_p.a comp-obsolete obsolete
-./usr/lib/libstdc++.a comp-cxx-lib cxx,gcccmds,libstdcxx
-./usr/lib/libstdc++_p.a comp-cxx-proflib profile,cxx,gcccmds,libstdcxx
-./usr/lib/libsupc++.a comp-cxx-lib cxx,gcccmds,libstdcxx
+./usr/lib/libstdc++.a comp-cxx-lib cxx,libstdcxx
+./usr/lib/libstdc++_p.a comp-cxx-proflib profile,cxx,libstdcxx
+./usr/lib/libsupc++.a comp-cxx-lib cxx,libstdcxx
./usr/lib/libtddl.a comp-c-lib tpm
./usr/lib/libtddl_p.a comp-c-proflib tpm,profile
./usr/lib/libtelnet.a comp-obsolete obsolete
diff -r 7f5845d777cf -r 4db4c4d37faf distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi Mon Jan 05 01:36:36 2015 +0000
+++ b/distrib/sets/lists/tests/mi Mon Jan 05 01:52:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.605 2014/12/21 15:38:27 martin Exp $
+# $NetBSD: mi,v 1.606 2015/01/05 01:52:23 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2889,7 +2889,7 @@
./usr/tests/lib/libobjc tests-lib-tests atf
./usr/tests/lib/libobjc/Atffile tests-lib-tests atf
./usr/tests/lib/libobjc/Kyuafile tests-lib-tests atf,kyua
-./usr/tests/lib/libobjc/t_threads tests-lib-tests atf,gcccmds
+./usr/tests/lib/libobjc/t_threads tests-lib-tests atf
./usr/tests/lib/libposix tests-lib-tests atf
./usr/tests/lib/libposix/Atffile tests-lib-tests atf
./usr/tests/lib/libposix/Kyuafile tests-lib-tests atf,kyua
diff -r 7f5845d777cf -r 4db4c4d37faf external/gpl3/Makefile
--- a/external/gpl3/Makefile Mon Jan 05 01:36:36 2015 +0000
+++ b/external/gpl3/Makefile Mon Jan 05 01:52:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/06/14 20:49:36 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2015/01/05 01:52:23 mrg Exp $
.include <bsd.own.mk>
@@ -7,10 +7,8 @@
.endif
.if ${MKGCC} != "no"
-.if ${MKGCCCMDS} != "no"
SUBDIR+= ${EXTERNAL_GCC_SUBDIR}
.endif
-.endif
.if ${MKGDB} != "no"
.if ${HAVE_GDB} == "7"
diff -r 7f5845d777cf -r 4db4c4d37faf external/gpl3/gcc.old/Makefile
--- a/external/gpl3/gcc.old/Makefile Mon Jan 05 01:36:36 2015 +0000
+++ b/external/gpl3/gcc.old/Makefile Mon Jan 05 01:52:23 2015 +0000
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2014/02/25 18:38:34 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/01/05 01:52:23 mrg Exp $
+
+SUBDIR+= lib
-SUBDIR+= lib .WAIT usr.bin
+.include <bsd.own.mk>
+
+.if ${MKGCCCMDS} != "no"
+SUBDIR+= .WAIT usr.bin
+.endif
.include <bsd.subdir.mk>
diff -r 7f5845d777cf -r 4db4c4d37faf external/gpl3/gcc/Makefile
--- a/external/gpl3/gcc/Makefile Mon Jan 05 01:36:36 2015 +0000
+++ b/external/gpl3/gcc/Makefile Mon Jan 05 01:52:23 2015 +0000
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 04:53:33 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/01/05 01:52:23 mrg Exp $
+
+SUBDIR+= lib
-SUBDIR+= lib .WAIT usr.bin
+.include <bsd.own.mk>
+
+.if ${MKGCCCMDS} != "no"
+SUBDIR+= .WAIT usr.bin
+.endif
.include <bsd.subdir.mk>
diff -r 7f5845d777cf -r 4db4c4d37faf external/gpl3/gcc/lib/libmudflap/Makefile
--- a/external/gpl3/gcc/lib/libmudflap/Makefile Mon Jan 05 01:36:36 2015 +0000
+++ b/external/gpl3/gcc/lib/libmudflap/Makefile Mon Jan 05 01:52:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:01 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2015/01/05 01:52:23 mrg Exp $
NOLINT=yes # core dumps
UNSUPPORTED_COMPILER.clang= # defined
@@ -14,6 +14,9 @@
LIB=mudflap
SRCS=mf-runtime.c mf-heuristics.c mf-hooks1.c mf-hooks2.c
+
+.include <bsd.own.mk>
+
INCS=mf-runtime.h
INCSDIR=/usr/include/gcc-4.8
diff -r 7f5845d777cf -r 4db4c4d37faf share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Mon Jan 05 01:36:36 2015 +0000
+++ b/share/mk/bsd.own.mk Mon Jan 05 01:52:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.839 2014/12/18 02:28:34 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.840 2015/01/05 01:52:23 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -74,6 +74,12 @@
.endif
#
+# Platforms that can't run a modern GCC natively
+.if ${MACHINE_ARCH} == "m68000"
+MKGCCCMDS?= no
+.endif
+
+#
# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is
# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
#
Home |
Main Index |
Thread Index |
Old Index