Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src prepare for moving GCC 4.5 into gcc.old:
details: https://anonhg.NetBSD.org/src/rev/00adb570d25c
branches: trunk
changeset: 327059:00adb570d25c
user: mrg <mrg%NetBSD.org@localhost>
date: Wed Feb 26 09:54:32 2014 +0000
description:
prepare for moving GCC 4.5 into gcc.old:
- convert to using ${EXTERNAL_GCC_SUBDIR}
- define base-external-gpl3-gcc* subdir as GCC_SUBDIR
- use <bsd.init.mk> over <bsd.own.mk> for a bunch of places; mostly
because it arranges for ../Makefile.inc to be included earlier, and
don't bother including the latter if the former is already included.
- move all .PATH: settings after <bsd.{own,lib}.mk> so that all
valid variables are set before it is evaluated
- rename mknative-gcc* to match their subdir name.
XXX the relationship between the Makefile.inc/Makefile.gcc_path files
is kind of sketchy, it would be great if this was fixed.
diffstat:
Makefile | 4 +-
external/gpl3/Makefile | 4 +-
external/gpl3/gcc/Makefile.gcc_path | 20 +
external/gpl3/gcc/lib/Makefile.inc | 10 +
external/gpl3/gcc/lib/crtstuff/Makefile | 8 +-
external/gpl3/gcc/lib/libgcc/Makefile.inc | 10 +-
external/gpl3/gcc/lib/libgcc/libgcc/Makefile | 3 +-
external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile | 3 +-
external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile | 3 +-
external/gpl3/gcc/lib/libgcc/libgcov/Makefile | 3 +-
external/gpl3/gcc/lib/libgomp/Makefile | 10 +-
external/gpl3/gcc/lib/libiberty/Makefile | 6 +-
external/gpl3/gcc/lib/libmudflap/Makefile | 10 +-
external/gpl3/gcc/lib/libmudflapth/Makefile | 10 +-
external/gpl3/gcc/lib/libobjc/Makefile | 17 +-
external/gpl3/gcc/lib/libstdc++-v3/Makefile | 4 +-
external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc | 11 +-
external/gpl3/gcc/lib/libstdc++-v3/include/Makefile | 4 +-
external/gpl3/gcc/lib/libstdc++-v3/include/Makefile.inc | 10 +-
external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile | 9 +-
external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile | 10 +-
external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile | 8 +-
external/gpl3/gcc/lib/libstdc++-v3/include/decimal/Makefile | 8 +-
external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile | 13 +-
external/gpl3/gcc/lib/libstdc++-v3/include/parallel/Makefile | 8 +-
external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile | 8 +-
external/gpl3/gcc/lib/libstdc++-v3/include/tr1_impl/Makefile | 8 +-
external/gpl3/gcc/lib/libsupc++/Makefile | 4 +-
external/gpl3/gcc/usr.bin/Makefile.inc | 7 +-
external/gpl3/gcc/usr.bin/libdecnumber/Makefile | 2 +-
lib/Makefile | 14 +-
tools/gcc/Makefile | 11 +-
tools/gcc/README.mknative | 5 +-
tools/gcc/mknative-gcc | 559 +------
tools/gcc/mknative-gcc.old | 746 +++++++++++
tools/gcc/mknative-gcc48 | 421 ------
36 files changed, 1017 insertions(+), 974 deletions(-)
diffs (truncated from 2711 to 300 lines):
diff -r bc1229093fb7 -r 00adb570d25c Makefile
--- a/Makefile Wed Feb 26 07:57:09 2014 +0000
+++ b/Makefile Wed Feb 26 09:54:32 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.304 2014/01/16 01:15:32 christos Exp $
+# $NetBSD: Makefile,v 1.305 2014/02/26 09:54:32 mrg Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -205,7 +205,7 @@
BUILD_CC_LIB_BASETARGET= gnu-lib
.else
LIBGCC_EXT=
-BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib
+BUILD_CC_LIB_BASEDIR= external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib
BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
.endif
.endif
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/Makefile
--- a/external/gpl3/Makefile Wed Feb 26 07:57:09 2014 +0000
+++ b/external/gpl3/Makefile Wed Feb 26 09:54:32 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/10/31 17:28:10 christos Exp $
+# $NetBSD: Makefile,v 1.9 2014/02/26 09:54:32 mrg Exp $
.include <bsd.own.mk>
@@ -9,7 +9,7 @@
.if ${MKGCC} != "no"
.if ${HAVE_GCC} >= 45
.if ${MKGCCCMDS} != "no"
-SUBDIR+= gcc
+SUBDIR+= ${EXTERNAL_GCC_SUBDIR}
.endif
.endif
.endif
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/Makefile.gcc_path
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/Makefile.gcc_path Wed Feb 26 09:54:32 2014 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.gcc_path,v 1.1 2014/02/26 09:54:32 mrg Exp $
+
+# Define some commom paths
+
+.ifndef _EXTERNAL_GPL3_GCC_MAKEFILE_INC_
+_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
+#.endif
+
+.endif # _GPL3_GCC_MAKEFILE_INC_
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/lib/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/lib/Makefile.inc Wed Feb 26 09:54:32 2014 +0000
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/02/26 09:54:32 mrg Exp $
+
+.ifndef _EXTERNAL_GPL3_GCC_LIB_MAKEFILE_INC_
+_EXTERNAL_GPL3_GCC_LIB_MAKEFILE_INC_=1
+
+.sinclude "../../Makefile.gcc_path"
+.sinclude "../../../Makefile.gcc_path"
+.sinclude "../../../../Makefile.gcc_path"
+
+.endif
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/lib/crtstuff/Makefile
--- a/external/gpl3/gcc/lib/crtstuff/Makefile Wed Feb 26 07:57:09 2014 +0000
+++ b/external/gpl3/gcc/lib/crtstuff/Makefile Wed Feb 26 09:54:32 2014 +0000
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.7 2012/02/28 20:26:07 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2014/02/26 09:54:32 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
UNSUPPORTED_COMPILER.clang= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
# If using an external toolchain, we expect crtbegin/crtend to be
# supplied by that toolchain's run-time support.
.if !defined(EXTERNAL_TOOLCHAIN) && ${MKGCC} != "no"
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
-GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH}
+GCCARCH= ${EXTERNAL_GCC_SUBDIR}/usr.bin/gcc/arch/${MACHINE_ARCH}
GALLCFLAGS= ${G_CRTSTUFF_CFLAGS} ${G_CRTSTUFF_T_CFLAGS}
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc Wed Feb 26 07:57:09 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc Wed Feb 26 09:54:32 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.21 2013/08/22 00:16:54 matt Exp $
+# $NetBSD: Makefile.inc,v 1.22 2014/02/26 09:54:32 mrg Exp $
.if ${MKGCC} != "no"
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -9,11 +9,11 @@
UNSUPPORTED_COMPILER.clang= # defined
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
-GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${LIBGCC_MACHINE_ARCH}
-GCCARCHLIBGCC= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libgcc/arch/${LIBGCC_MACHINE_ARCH}
-GCCARCHXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${LIBGCC_MACHINE_ARCH}
+GCCARCH= ${GCC_SUBDIR}/usr.bin/gcc/arch/${LIBGCC_MACHINE_ARCH}
+GCCARCHLIBGCC= ${GCC_SUBDIR}/lib/libgcc/arch/${LIBGCC_MACHINE_ARCH}
+GCCARCHXX= ${GCC_SUBDIR}/lib/libstdc++-v3/arch/${LIBGCC_MACHINE_ARCH}
GCPPFLAGS= ${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES}
CPPFLAGS+= -I${.CURDIR} -I${GCCARCHLIBGCC}
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/lib/libgcc/libgcc/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Wed Feb 26 07:57:09 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Wed Feb 26 09:54:32 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/01/11 02:45:52 matt Exp $
+# $NetBSD: Makefile,v 1.19 2014/02/26 09:54:32 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -7,6 +7,7 @@
LIB= gcc
+.include "../../../Makefile.gcc_path"
.include <bsd.own.mk>
.if ${MKGCC} != "no"
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile Wed Feb 26 07:57:09 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile Wed Feb 26 09:54:32 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/08/06 00:21:09 matt Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/26 09:54:32 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -7,6 +7,7 @@
LIB= gcc_eh
+.include "../../../Makefile.gcc_path"
.include <bsd.own.mk>
.if ${MKGCC} != "no"
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile Wed Feb 26 07:57:09 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile Wed Feb 26 09:54:32 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/08/06 00:19:03 matt Exp $
+# $NetBSD: Makefile,v 1.7 2014/02/26 09:54:32 mrg Exp $
USE_SHLIBDIR= yes
REQUIRETOOLS= yes
@@ -9,6 +9,7 @@
NOPROFILE= # defined
NOPICINSTALL= # defined
+.include "../../../Makefile.gcc_path"
.include <bsd.own.mk>
.if ${MKGCC} != "no"
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/lib/libgcc/libgcov/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcov/Makefile Wed Feb 26 07:57:09 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcov/Makefile Wed Feb 26 09:54:32 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/08/22 00:16:54 matt Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/26 09:54:32 mrg Exp $
REQUIRETOOLS= yes
NOPIC= # defined
@@ -7,6 +7,7 @@
LIB= gcov
+.include "../../../Makefile.gcc_path"
.include <bsd.own.mk>
.include <bsd.init.mk>
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/lib/libgomp/Makefile
--- a/external/gpl3/gcc/lib/libgomp/Makefile Wed Feb 26 07:57:09 2014 +0000
+++ b/external/gpl3/gcc/lib/libgomp/Makefile Wed Feb 26 09:54:32 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/08/23 05:02:46 matt Exp $
+# $NetBSD: Makefile,v 1.10 2014/02/26 09:54:32 mrg Exp $
# build GCC's libgomp, so that -fopenmp works.
@@ -9,7 +9,7 @@
.if !defined(NO_LIBGOMP) # {
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST= ${GCCDIST}
LIB= gomp
SRCS= \
@@ -50,6 +50,8 @@
-I${ARCHDIR}
CFLAGS+=-pthread
+COPTS+= -Wno-stack-protector
+
CWARNFLAGS.clang+= -Wno-conversion
# libgomp.so.1.0 is in GCC 4.5.
@@ -58,8 +60,6 @@
LDFLAGS+= -Wl,--version-script,${DIST}/libgomp/libgomp.map
-.PATH: ${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix
-
.if ${GOMP_MACHINE_ARCH} == ${MACHINE_ARCH:S/earmv5/earm/}
# This is where GCC looks for it.
FILES= libgomp.spec
@@ -75,4 +75,4 @@
.include <bsd.lib.mk>
-COPTS+= -Wno-stack-protector
+.PATH: ${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/lib/libiberty/Makefile
--- a/external/gpl3/gcc/lib/libiberty/Makefile Wed Feb 26 07:57:09 2014 +0000
+++ b/external/gpl3/gcc/lib/libiberty/Makefile Wed Feb 26 09:54:32 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2013/08/22 00:16:54 matt Exp $
+# $NetBSD: Makefile,v 1.5 2014/02/26 09:54:33 mrg Exp $
LIBISPRIVATE= yes
-.include <bsd.own.mk>
+.include <bsd.init.mk>
GCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -10,7 +10,7 @@
.include "${.CURDIR}/defs.mk"
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/lib/libmudflap/Makefile
--- a/external/gpl3/gcc/lib/libmudflap/Makefile Wed Feb 26 07:57:09 2014 +0000
+++ b/external/gpl3/gcc/lib/libmudflap/Makefile Wed Feb 26 09:54:32 2014 +0000
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2012/04/18 19:21:25 christos Exp $
+# $NetBSD: Makefile,v 1.3 2014/02/26 09:54:33 mrg Exp $
NOLINT=yes # core dumps
UNSUPPORTED_COMPILER.clang= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist/libmudflap
+DIST= ${GCCDIST}/libmudflap
CPPFLAGS+= -I${.CURDIR}
LINTFLAGS+=-g
-.PATH: ${DIST}
-
LIB=mudflap
SRCS=mf-runtime.c mf-heuristics.c mf-hooks1.c mf-hooks2.c
INCS=mf-runtime.h
INCSDIR=/usr/include/gcc-4.5
.include <bsd.lib.mk>
+
+.PATH: ${DIST}
diff -r bc1229093fb7 -r 00adb570d25c external/gpl3/gcc/lib/libmudflapth/Makefile
--- a/external/gpl3/gcc/lib/libmudflapth/Makefile Wed Feb 26 07:57:09 2014 +0000
+++ b/external/gpl3/gcc/lib/libmudflapth/Makefile Wed Feb 26 09:54:32 2014 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2012/04/18 22:42:21 christos Exp $
+# $NetBSD: Makefile,v 1.3 2014/02/26 09:54:33 mrg Exp $
NOLINT=yes # core dumps
UNSUPPORTED_COMPILER.clang= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist/libmudflap
Home |
Main Index |
Thread Index |
Old Index