Module Name: src
Committed By: mrg
Date: Thu Jun 23 11:47:13 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/crtstuff: Makefile
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libiberty: Makefile
src/external/gpl3/gcc/lib/libobjc: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/backward: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/debug: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/ext: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile.common
src/external/gpl3/gcc/usr.bin: Makefile.inc
Log Message:
fix a bunch of paths to look in the right places for gcc 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/crtstuff/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libiberty/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libobjc/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libsupc++/Makefile.common
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/crtstuff/Makefile
diff -u src/external/gpl3/gcc/lib/crtstuff/Makefile:1.1 src/external/gpl3/gcc/lib/crtstuff/Makefile:1.2
--- src/external/gpl3/gcc/lib/crtstuff/Makefile:1.1 Tue Jun 21 06:02:25 2011
+++ src/external/gpl3/gcc/lib/crtstuff/Makefile Thu Jun 23 11:47:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:25 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -9,9 +9,9 @@
# supplied by that toolchain's run-time support.
.if !defined(EXTERNAL_TOOLCHAIN) && ${MKGCC} != "no"
-DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${DIST}
-GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
+GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH}
GALLCFLAGS= ${G_CRTSTUFF_CFLAGS} ${G_CRTSTUFF_T_CFLAGS}
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.1 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.2
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.1 Tue Jun 21 06:02:25 2011
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Thu Jun 23 11:47:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/06/21 06:02:25 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/06/23 11:47:12 mrg Exp $
.if ${MKGCC} != "no"
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -8,11 +8,11 @@
UNSUPPORTED_COMPILER.clang= # defined
-DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${DIST}
-GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
-GCCARCHLIBGCC= ${NETBSDSRCDIR}/gnu/lib/libgcc4/arch/${MACHINE_ARCH}
-GCCARCHXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH}
+GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH}
+GCCARCHLIBGCC= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libgcc/arch/${MACHINE_ARCH}
+GCCARCHXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${MACHINE_ARCH}
GCPPFLAGS= ${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES}
CPPFLAGS+= -I${.CURDIR} -I${GCCARCHLIBGCC}
Index: src/external/gpl3/gcc/lib/libiberty/Makefile
diff -u src/external/gpl3/gcc/lib/libiberty/Makefile:1.1 src/external/gpl3/gcc/lib/libiberty/Makefile:1.2
--- src/external/gpl3/gcc/lib/libiberty/Makefile:1.1 Tue Jun 21 06:02:27 2011
+++ src/external/gpl3/gcc/lib/libiberty/Makefile Thu Jun 23 11:47:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
LIBISPRIVATE= yes
@@ -8,7 +8,7 @@
.include "${.CURDIR}/defs.mk"
-DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${DIST}
SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \
Index: src/external/gpl3/gcc/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.1 src/external/gpl3/gcc/lib/libobjc/Makefile:1.2
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.1 Tue Jun 21 06:02:27 2011
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Thu Jun 23 11:47:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -25,13 +25,13 @@
EXTRA_FAKEHEADERS= options.h
.endif
-LIBGCCOBJ!= cd ${.CURDIR}/../libgcc4/libgcc && ${PRINTOBJDIR}
+LIBGCCOBJ!= cd ${.CURDIR}/../libgcc/libgcc && ${PRINTOBJDIR}
-DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
-GNUHOSTDIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
-GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
-LIBOBJCARCH= ${NETBSDSRCDIR}/gnu/lib/libobjc4/arch/${MACHINE_ARCH}
-GCCLIBXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH}
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+GNUHOSTDIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
+GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH}
+LIBOBJCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libobjc/arch/${MACHINE_ARCH}
+GCCLIBXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${MACHINE_ARCH}
SRCS= ${G_OBJS:N[A-Z]*:Nlinking.lo:.lo=.c} ${G_OBJS:M[A-Z]*:.lo=.m} linking.m
@@ -40,7 +40,7 @@
CPPFLAGS+= -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*}
CPPFLAGS+= -I${GCCLIBXX}
-BUILDSYMLINKS= ${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH} bits
+BUILDSYMLINKS= ${.CURDIR}/../libstdc++-v3/arch/${MACHINE_ARCH} bits
DPSRCS+= bits
.for f in Protocol.m Object.m NXConstStr.m linking.m
@@ -113,3 +113,6 @@
.else
.include <bsd.prog.mk> # do nothing
.endif
+
+COPTS.archive.c+= -Wno-error
+COPTS.sendmsg.c+= -Wno-error
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.1 Tue Jun 21 06:02:27 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile Thu Jun 23 11:47:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
SUBDIR= backward ext bits debug tr1
#SUBDIR+= pb_assoc
@@ -9,7 +9,7 @@
.cc: # disable .cc->NULL transform
-DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
INCS= exception new typeinfo cxxabi.h exception_defines.h
INCS+= ${G_std_headers_rename} ${G_c_base_headers_rename}
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile:1.1 Tue Jun 21 06:02:27 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile Thu Jun 23 11:47:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
.cc: # disable .cc->NULL transform
-DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
INCS= ${G_backward_headers}
INCSDIR= /usr/include/g++/backward
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.1 Tue Jun 21 06:02:27 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Thu Jun 23 11:47:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
.cc: # disable .cc->NULL transform
-DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
CONF= ${DIST}/libstdc++-v3/config
INCS= ${G_bits_headers} ${G_c_base_headers_extra} ${G_thread_host_headers} ${G_host_headers_extra} ${G_host_headers}
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile:1.1 Tue Jun 21 06:02:27 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile Thu Jun 23 11:47:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:13 mrg Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
.cc: # disable .cc->NULL transform
-DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
INCS= ${G_debug_headers}
INCSDIR= /usr/include/g++/debug
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile:1.1 Tue Jun 21 06:02:27 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile Thu Jun 23 11:47:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:13 mrg Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
.cc: # disable .cc->NULL transform
-DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
INCS= ${G_ext_headers}
INCSDIR= /usr/include/g++/ext
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile:1.1 Tue Jun 21 06:02:28 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile Thu Jun 23 11:47:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:28 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:13 mrg Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
.cc: # disable .cc->NULL transform
-DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
INCS= ${G_tr1_headers}
INCSDIR= /usr/include/g++/tr1
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile.common
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.1 src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.2
--- src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.1 Tue Jun 21 06:02:28 2011
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile.common Thu Jun 23 11:47:13 2011
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.1 2011/06/21 06:02:28 mrg Exp $
+# $NetBSD: Makefile.common,v 1.2 2011/06/23 11:47:13 mrg Exp $
-DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
+DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${DIST}
LIBMATHSRCS= ${G_libmath_la_SOURCES} ${G_libmath_la_LIBADD:.lo=.c}
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.1 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.2
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.1 Tue Jun 21 06:03:13 2011
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Thu Jun 23 11:47:13 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/06/21 06:03:13 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/06/23 11:47:13 mrg Exp $
.include <bsd.own.mk>
-TOP= ${NETBSDSRCDIR}/gnu
-DIST= ${TOP}/dist/gcc4
+TOP= ${NETBSDSRCDIR}
+DIST= ${TOP}/external/gpl3/gcc/dist
GCCARCH= ${.CURDIR}/../arch/${MACHINE_ARCH}
