Module Name:    src
Committed By:   mrg
Date:           Tue Jul 19 01:38:00 UTC 2011

Modified Files:
        src/external/gpl3/gcc/usr.bin/backend: Makefile

Log Message:
merge the common CPPFLAGS and HOST_CPPFLAGS.  put -DGENERATOR_FILE
into HOST_CPPFLAGS, and remove the hacky list of files to build
with it.  this matches what the real GCC build does, and fixes build
problems seen on OSX.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/usr.bin/backend/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/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.9 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.10
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.9	Wed Jul  6 01:18:32 2011
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Tue Jul 19 01:37:59 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2011/07/06 01:18:32 mrg Exp $
+#	$NetBSD: Makefile,v 1.10 2011/07/19 01:37:59 mrg Exp $
 
 LIBISPRIVATE=	yes
 
@@ -6,9 +6,9 @@
 
 SRCS=		${G_OBJS:.o=.c} ${G_out_file:T}
 
-CPPFLAGS+=	-I. -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \
-		-DTARGET_NAME=\"${MACHINE_GNU_PLATFORM}\"
-HOST_CPPFLAGS+=	-I. -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
+BOTH_CPPFLAGS+=	-I. -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
+CPPFLAGS+=	${BOTH_CPPFLAGS} -DTARGET_NAME=\"${MACHINE_GNU_PLATFORM}\"
+HOST_CPPFLAGS+=	${BOTH_CPPFLAGS} -DGENERATOR_FILE
 DPSRCS+=	insn-attr.h insn-codes.h insn-config.h insn-flags.h tree-check.h
 CPPFLAGS.prefix.c+=	-DPREFIX=\"/usr\"
 CPPFLAGS.cppdefault.c+=	-DPREFIX=\"/usr\"
@@ -41,14 +41,6 @@
 		cs-config.h \
 		gcov-iov gcov-iov.h \
 
-#
-# These files have special needs
-#
-.for f in \
-	build-errors build-ggc-none build-print-rtl build-rtl build-varray dummy-conditions gcov-iov genattr genattrtab genautomata gencheck genchecksum gencodes genconditions genconfig genconstants genemit genextract genflags gengenrtl gengtype gengtype-lex genmddeps genmodes genopinit genoutput genpeep genpreds genrecog gensupport insn-conditions min-insn-modes read-rtl
-CPPFLAGS.${f}.c=		-DGENERATOR_FILE
-.endfor
-
 # XXX
 COPTS.varasm.c=			-Wno-error
 
@@ -319,4 +311,9 @@
 
 COPTS+=-Wno-stack-protector
 
+.if ${MACHINE_ARCH} == "m68000"
+COPTS.lambda-code.c=		-O0
+COPTS.tree-loop-linear.c=	-O0
+.endif
+
 .PATH: ${DIST}/gcc ${DIST}/libiberty ${GCCARCH} ${G_out_file:H} ${DIST}/include

Reply via email to