Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/gpl3/gcc port over 3 changes made here in the GCC 4...
details: https://anonhg.NetBSD.org/src/rev/4a970d92cb9b
branches: trunk
changeset: 796411:4a970d92cb9b
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Jun 01 19:51:01 2014 +0000
description:
port over 3 changes made here in the GCC 4.5 tree that we'll need
when GCC 4.8 becomes "gcc.old" eventually.
this tree still needs to be tested for more, but this should be the
bulk of the work.
----
Log Message:
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.
----
Log Message:
oops, avoid re-setting DIST to something that might be wrong now.
----
Log Message:
fix another dated DIST.
diffstat:
external/gpl3/gcc/lib/Makefile.inc | 11 ++++++-
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 | 18 ++++++------
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 | 9 ++---
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 | 11 +++----
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/lib/libsupc++/Makefile.common | 4 +-
external/gpl3/gcc/usr.bin/Makefile.inc | 6 ++-
external/gpl3/gcc/usr.bin/libdecnumber/Makefile | 4 +-
28 files changed, 114 insertions(+), 97 deletions(-)
diffs (truncated from 663 to 300 lines):
diff -r 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/Makefile.inc
--- a/external/gpl3/gcc/lib/Makefile.inc Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/Makefile.inc Sun Jun 01 19:51:01 2014 +0000
@@ -1,3 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.2 2014/03/01 10:00:31 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2014/06/01 19:51:01 mrg Exp $
GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
+
+.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 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/crtstuff/Makefile
--- a/external/gpl3/gcc/lib/crtstuff/Makefile Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/crtstuff/Makefile Sun Jun 01 19:51:01 2014 +0000
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.12 2014/03/09 20:59:14 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2014/06/01 19:51:01 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 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc Sun Jun 01 19:51:01 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.27 2014/05/15 14:37:08 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.28 2014/06/01 19:51:01 mrg Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -10,11 +10,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 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/libgcc/libgcc/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Sun Jun 01 19:51:01 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/03/01 10:00:36 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2014/06/01 19:51:01 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 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile Sun Jun 01 19:51:01 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/03/21 20:54:13 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2014/06/01 19:51:01 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 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile Sun Jun 01 19:51:01 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/03/05 21:38:59 tron Exp $
+# $NetBSD: Makefile,v 1.10 2014/06/01 19:51:01 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 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/libgcc/libgcov/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcov/Makefile Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcov/Makefile Sun Jun 01 19:51:01 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/01 10:00:36 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/01 19:51:01 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 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/libgomp/Makefile
--- a/external/gpl3/gcc/lib/libgomp/Makefile Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/libgomp/Makefile Sun Jun 01 19:51:01 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/03/01 10:00:38 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2014/06/01 19:51:01 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 is 1.0 is in GCC 4.5, and 1.1 in 4.8 since it added more symbols
@@ -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 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/libiberty/Makefile
--- a/external/gpl3/gcc/lib/libiberty/Makefile Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/libiberty/Makefile Sun Jun 01 19:51:01 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/03/01 10:00:40 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2014/06/01 19:51:01 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 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/libmudflap/Makefile
--- a/external/gpl3/gcc/lib/libmudflap/Makefile Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/libmudflap/Makefile Sun Jun 01 19:51:01 2014 +0000
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:42 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:01 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}
-
SHLIB_MAJOR= 0
SHLIB_MINOR= 0
@@ -20,3 +18,5 @@
INCSDIR=/usr/include/gcc-4.8
.include <bsd.lib.mk>
+
+.PATH: ${DIST}
diff -r 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/libmudflapth/Makefile
--- a/external/gpl3/gcc/lib/libmudflapth/Makefile Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/libmudflapth/Makefile Sun Jun 01 19:51:01 2014 +0000
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:42 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:01 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}/../libmudflap -DLIBMUDFLAPTH
-.PATH: ${DIST}
-
SHLIB_MAJOR= 0
SHLIB_MINOR= 0
@@ -18,3 +16,5 @@
SRCS=mf-runtime.c mf-heuristics.c mf-hooks1.c mf-hooks2.c mf-hooks3.c
.include <bsd.lib.mk>
+
+.PATH: ${DIST}
diff -r 5a78a2a9f819 -r 4a970d92cb9b external/gpl3/gcc/lib/libobjc/Makefile
--- a/external/gpl3/gcc/lib/libobjc/Makefile Sun Jun 01 17:46:06 2014 +0000
+++ b/external/gpl3/gcc/lib/libobjc/Makefile Sun Jun 01 19:51:01 2014 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2014/05/15 14:37:08 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2014/06/01 19:51:01 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
UNSUPPORTED_COMPILER.clang= # defined
-.include <bsd.own.mk>
+.include <bsd.init.mk>
LIB= objc
GCC_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv5/earm/}
@@ -28,11 +28,11 @@
LIBGCCOBJ!= cd ${.CURDIR}/../libgcc/libgcc && ${PRINTOBJDIR}
-DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
-GNUHOSTDIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
-GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${GCC_MACHINE_ARCH}
-LIBOBJCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libobjc/arch/${GCC_MACHINE_ARCH}
-GCCLIBXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${GCC_MACHINE_ARCH}
+DIST= ${GCCDIST}
+GNUHOSTDIST= ${DIST}
+GCCARCH= ${GCC_SUBDIR}/usr.bin/gcc/arch/${GCC_MACHINE_ARCH}
+LIBOBJCARCH= ${GCC_SUBDIR}/lib/libobjc/arch/${GCC_MACHINE_ARCH}
+GCCLIBXX= ${GCC_SUBDIR}/lib/libstdc++-v3/arch/${GCC_MACHINE_ARCH}
SRCS= ${G_OBJC_SOURCE_FILES} ${G_C_SOURCE_FILES}
@@ -70,8 +70,6 @@
touch rtscratch
`${OBJC} --print-prog-name=cc1obj` -print-objc-runtime-info rtscratch >$@
-.PATH: ${DIST}/libobjc ${DIST}/libobjc/objc ${DIST}/libobjc/objc-private
-
${OBJS} ${POBJS} ${SOBJS}: runtime-info.h
Home |
Main Index |
Thread Index |
Old Index