Module Name: src
Committed By: mrg
Date: Wed Jun 29 01:58:00 UTC 2011
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
Log Message:
- build libdecnumber
- don't build protoize/unprotoize
- use libdecnumber and VER_CPPFLAGS
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
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/usr.bin/Makefile
diff -u src/external/gpl3/gcc/usr.bin/Makefile:1.2 src/external/gpl3/gcc/usr.bin/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/Makefile:1.2 Fri Jun 24 05:25:24 2011
+++ src/external/gpl3/gcc/usr.bin/Makefile Wed Jun 29 01:57:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/24 05:25:24 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/06/29 01:57:59 mrg Exp $
NOOBJ=# defined
@@ -11,9 +11,9 @@
SUBDIR+= host-libiberty .WAIT \
backend .WAIT \
frontend .WAIT \
- libcpp gcov .WAIT \
+ libcpp libdecnumber gcov .WAIT \
cc1 cc1obj cc1plus cpp g++ gcc \
- include protoize unprotoize
+ include
.include <bsd.subdir.mk>
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.1 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.2
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.1 Tue Jun 21 06:03:13 2011
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Wed Jun 29 01:57:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:03:13 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/29 01:57:59 mrg Exp $
MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS}
PROG= cc1obj
@@ -9,7 +9,13 @@
.include "../Makefile.backend"
.include "../Makefile.libcpp"
+.include "../Makefile.libdecnumber"
+
+# VER_CPPFLAGS from Makefile.inc
+CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS}
COPTS+= -Wno-stack-protector
+LDADD+= -lintl -lgmp -lmpfr -lmpc -lz
+
.PATH: ${DIST}/gcc/objc ${DIST}/gcc ${G_out_file:H}
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.1 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.2
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.1 Tue Jun 21 06:03:13 2011
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Wed Jun 29 01:57:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:03:13 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/29 01:57:59 mrg Exp $
PROG= cc1plus
SRCS= ${G_CXX_OBJS:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -8,8 +8,14 @@
.include "../Makefile.backend"
.include "../Makefile.libcpp"
+.include "../Makefile.libdecnumber"
+
+# VER_CPPFLAGS from Makefile.inc
+CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS}
# YUCK. but see timevar.h:POP_TIMEVAR_AND_RETURN
CFLAGS+= -Wno-error # not good enough: -Wno-return-type
+LDADD+= -lintl -lgmp -lmpfr -lmpc -lz
+
.PATH: ${DIST}/gcc/cp ${DIST}/gcc ${G_out_file:H}
