Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/usr.bin/gcc3/backend Use .lo for host tool objects.
details: https://anonhg.NetBSD.org/src/rev/270f55492216
branches: trunk
changeset: 555408:270f55492216
user: lukem <lukem%NetBSD.org@localhost>
date: Sun Nov 16 16:24:48 2003 +0000
description:
Use .lo for host tool objects.
Use CPPFLAGS.file correctly (CPPFLAGS.foo.c _not_ CPPFLAGS.foo.o !)
Support MAKEVERBOSE.
Be consistent about make(1) variable use.
diffstat:
gnu/usr.bin/gcc3/backend/Makefile | 213 ++++++++++++++++++++-----------------
1 files changed, 114 insertions(+), 99 deletions(-)
diffs (truncated from 334 to 300 lines):
diff -r f09fc94e803d -r 270f55492216 gnu/usr.bin/gcc3/backend/Makefile
--- a/gnu/usr.bin/gcc3/backend/Makefile Sun Nov 16 16:17:13 2003 +0000
+++ b/gnu/usr.bin/gcc3/backend/Makefile Sun Nov 16 16:24:48 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/11/05 00:05:48 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2003/11/16 16:24:48 lukem Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -23,24 +23,26 @@
#
# Independent generation programs.
#
-CLEANFILES+= gengenrtl gengenrtl.o genrtl.c genrtl.h \
+CLEANFILES+= gengenrtl genrtl.c genrtl.h \
gengtype gtyp-gen.h gtype-desc.c gtype-desc.h \
gtype-c.h gtype-cp.h gtype-f.h gtype-objc.h \
genflags genflags.h \
gencheck tree-check.h \
genpreds tm-preds.h tm_p.h cs-tm_p.h \
auto-host.h print-rtl1.c \
- build-rtl.c build-errors.c build-varray.c build-bitmap.c build-ggc-none.c \
- gt-*.h *.o \
+ build-rtl.c build-errors.c build-varray.c \
+ build-bitmap.c build-ggc-none.c \
+ gt-*.h *.o *.lo \
config.h cs-config.h \
#
# These files have special needs
#
-COPTS.prefix.o= -DPREFIX=\"$(prefix)\"
-COPTS.toplev.o= -DTARGET_NAME=\"$(target_alias)\"
-COPTS.insn-conditions.c= -DGENERATOR_FILE
-COPTS.sparc.o= -DTARGET_CPU_DEFAULT=${G_target_cpu_default}
+CPPFLAGS.build-errors.c= -DGENERATOR_FILE
+CPPFLAGS.build-ggc-none.c= -DGENERATOR_FILE
+CPPFLAGS.build-rtl.c= -DGENERATOR_FILE
+CPPFLAGS.insn-conditions.c= -DGENERATOR_FILE
+CPPFLAGS.print-rtl1.c= -DGENERATOR_FILE
# XXX
.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m68000"
@@ -54,84 +56,91 @@
# Generate the various header files we need.
#
genrtl.c: gengenrtl
- ./gengenrtl > genrtl.c
+ ${_MKTARGET_CREATE}
+ ./gengenrtl >${.TARGET}
genrtl.h: gengenrtl
- ./gengenrtl -h > genrtl.h
-gengenrtl.o: gengenrtl.c ${G_HCONFIG_H}
- ${HOST_COMPILE.c} $<
-gengenrtl: gengenrtl.o
- ${HOST_LINK.c} -o $@ $> ${NBCOMPATLIB} ${HOSTLIBIBERTY}
+ ${_MKTARGET_CREATE}
+ ./gengenrtl -h >${.TARGET}
+gengenrtl.lo: ${G_HCONFIG_H}
+gengenrtl: gengenrtl.lo
+ ${_MKTARGET_LINK}
+ ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
tm-preds.h: genpreds
- ./genpreds > tm-preds.h
-genpreds.o: genpreds.c $(HH)
- ${HOST_COMPILE.c} $<
-genpreds: genpreds.o
- ${HOST_LINK.c} -o $@ $> ${NBCOMPATLIB} ${HOSTLIBIBERTY}
+ ${_MKTARGET_CREATE}
+ ./genpreds >${.TARGET}
+genpreds.lo: ${HH}
+genpreds: genpreds.lo
+ ${_MKTARGET_LINK}
+ ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
tree-check.h: gencheck
- ./gencheck >$@
-gencheck.o: gencheck.c $(HH)
- ${HOST_COMPILE.c} $<
-gencheck: gencheck.o
- ${HOST_LINK.c} -o $@ $> ${NBCOMPATLIB} ${HOSTLIBIBERTY}
+ ${_MKTARGET_CREATE}
+ ./gencheck >${.TARGET}
+gencheck.lo: ${HH}
+gencheck: gencheck.lo
+ ${_MKTARGET_LINK}
+ ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
gtype-desc.c: gtype-desc.h
gtype-desc.h: gengtype
+ ${_MKTARGET_CREATE}
rm -f auto-host.h
ln -s ${.CURDIR}/../arch/${MACHINE_ARCH}/auto-host.h .
./gengtype
-gengtype.o: gengtype.c gtyp-gen.h $(HH)
- ${HOST_COMPILE.c} $<
-gengtype-lex.o: gengtype-lex.c $(HH)
- ${HOST_COMPILE.c} $<
-gengtype-yacc.o: gengtype-yacc.c $(HH)
- ${HOST_COMPILE.c} $<
-gengtype: gengtype.o gtyp-gen.h gengtype-lex.o gengtype-yacc.o config.h
- ${HOST_LINK.c} -o $@ gengtype.o gengtype-lex.o gengtype-yacc.o ${NBCOMPATLIB} ${HOSTLIBIBERTY}
+gengtype.lo gengtype-lex.lo gengtype-yacc.lo: ${HH} gtyp-gen.h config.h
+gengtype: gengtype.lo gengtype-lex.lo gengtype-yacc.lo
+ ${_MKTARGET_LINK}
+ ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
gtyp-gen.h: Makefile
- ( echo "static const char *srcdir = \"$(G_GTFILES_SRCDIR)\";" ; \
- echo "static const char *lang_files[] = {" ; \
- for f in $(G_GTFILES_FILES_FILES); do echo "\"$$f\", "; done ; \
- echo "NULL };" ; \
- echo "static const char *langs_for_lang_files[] = {" ; \
- for f in $(G_GTFILES_FILES_LANGS); do echo "\"$$f\", "; done ; \
- echo "NULL };" ; \
- echo "static const char *all_files[] = {" ; \
- for f in $(G_GTFILES); do echo "\"$$f\", "; done ; \
- echo " NULL };" ; \
- echo "static const char *lang_dir_names[] = {" ; \
- echo "\"c\", " ; \
- for f in $(G_GTFILES_LANG_DIR_NAMES); do echo "\"$$f\", "; done ; \
- echo "NULL };" ; \
- ) > gtyp-gen.h
+ ${_MKTARGET_CREATE}
+ (\
+ echo "static const char *srcdir = \"$(G_GTFILES_SRCDIR)\";" ; \
+ echo "static const char *lang_files[] = {" ; \
+ for f in $(G_GTFILES_FILES_FILES); do echo "\"$$f\", "; done ; \
+ echo "NULL };" ; \
+ echo "static const char *langs_for_lang_files[] = {" ; \
+ for f in $(G_GTFILES_FILES_LANGS); do echo "\"$$f\", "; done ; \
+ echo "NULL };" ; \
+ echo "static const char *all_files[] = {" ; \
+ for f in $(G_GTFILES); do echo "\"$$f\", "; done ; \
+ echo " NULL };" ; \
+ echo "static const char *lang_dir_names[] = {" ; \
+ echo "\"c\", " ; \
+ for f in $(G_GTFILES_LANG_DIR_NAMES); do echo "\"$$f\", "; done ; \
+ echo "NULL };" ; \
+ ) >${.TARGET}
config.h: Makefile
+ ${_MKTARGET_CREATE}
TM_DEFINES="$(G_tm_defines)" \
HEADERS="$(G_host_xm_file)" XM_DEFINES="$(G_host_xm_defines)" \
TARGET_CPU_DEFAULT="$(G_target_cpu_default)" \
- ${HOST_SH} $(GNUHOSTDIST)/gcc/mkconfig.sh config.h
+ ${HOST_SH} ${GNUHOSTDIST}/gcc/mkconfig.sh ${.TARGET}
tm_p.h: Makefile
+ ${_MKTARGET_CREATE}
TM_DEFINES="" \
HEADERS="$(G_tm_p_file)" XM_DEFINES="" TARGET_CPU_DEFAULT="" \
- ${HOST_SH} $(GNUHOSTDIST)/gcc/mkconfig.sh tm_p.h
+ ${HOST_SH} ${GNUHOSTDIST}/gcc/mkconfig.sh ${.TARGET}
CLEANFILES+= options.h
options.h: Makefile
+ ${_MKTARGET_CREATE}
for f in $(lang_options_files) ""; do \
if [ -n "$$f" ] ; then echo "#include \"$$f\""; fi; \
- done | sed 's|$(GNUHOSTDIST)/gcc/||' > options.h
+ done | sed 's|$(GNUHOSTDIST)/gcc/||' >${.TARGET}
# Yuck, we have to run configure to generate this one...
CLEANFILES+= auto-build.h
auto-build.h: Makefile
+ ${_MKTARGET_CREATE}
rm -rf .ab && \
mkdir .ab && \
(cd .ab && \
- ${HOST_SH} $(GNUHOSTDIST)/gcc/configure \
+ ${HOST_SH} ${GNUHOSTDIST}/gcc/configure \
--build=`${.CURDIR}/../../../dist/gcc/config.guess` \
--host=`${.CURDIR}/../../../dist/gcc/config.guess` \
--target=${MACHINE_GNU_PLATFORM} && \
@@ -142,101 +151,107 @@
# These are copies of files we build for the build host that are used
# by the genfoo programs.
#
+
build-rtl.c: rtl.c \
- $(G_RTL_H) real.h $(G_GCC_H) errors.h gtype-desc.h
+ ${G_RTL_H} real.h ${G_GCC_H} errors.h gtype-desc.h
+ ${_MKTARGET_CREATE}
rm -f build-rtl.c
- sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/rtl.c > build-rtl.c
-build-rtl.o: build-rtl.c $(HH)
- ${HOST_COMPILE.c} -DGENERATOR_FILE build-rtl.c
+ sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/rtl.c >${.TARGET}
+build-rtl.lo: ${HH}
print-rtl1.c: print-rtl.c \
- $(G_RTL_H) $(G_TREE_H) hard-reg-set.h $(G_BASIC_BLOCK_H)
+ ${G_RTL_H} ${G_TREE_H} hard-reg-set.h ${G_BASIC_BLOCK_H}
+ ${_MKTARGET_CREATE}
rm -f print-rtl1.c
- sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/print-rtl.c > print-rtl1.c
-print-rtl1.o: print-rtl.c $(HH)
- ${HOST_COMPILE.c} -DGENERATOR_FILE print-rtl1.c
+ sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/print-rtl.c >${.TARGET}
+print-rtl1.lo: ${HH}
build-bitmap.c: bitmap.c \
- $(G_RTL_H) flags.h $(G_BASIC_BLOCK_H) $(REGS_H) $(G_GCC_H) gtype-desc.h
+ ${G_RTL_H} flags.h ${G_BASIC_BLOCK_H} ${REGS_H} ${G_GCC_H} gtype-desc.h
+ ${_MKTARGET_CREATE}
rm -f build-bitmap.c
- sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/bitmap.c > build-bitmap.c
-build-bitmap.o: build-bitmap.c $(HH)
- ${HOST_COMPILE.c} ${COPTS.${.IMPSRC:T}} build-bitmap.c
+ sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/bitmap.c >${.TARGET}
+build-bitmap.lo: ${HH}
build-errors.c: errors.c errors.h
+ ${_MKTARGET_CREATE}
rm -f build-errors.c
- sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/errors.c > build-errors.c
-build-errors.o: build-errors.c $(HH)
- ${HOST_COMPILE.c} -DGENERATOR_FILE build-errors.c
+ sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/errors.c >${.TARGET}
+build-errors.lo: ${HH}
build-varray.c: varray.c \
- $(G_RTL_H) $(G_GCC_H) $(TREE_H) bitmap.h errors.h
+ ${G_RTL_H} ${G_GCC_H} ${TREE_H} bitmap.h errors.h
+ ${_MKTARGET_CREATE}
rm -f build-varray.c
- sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/varray.c > build-varray.c
-build-varray.o: build-varray.c $(HH) gtype-desc.h
- ${HOST_COMPILE.c} ${COPTS.${.IMPSRC:T}} build-varray.c
+ sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/varray.c >${.TARGET}
+build-varray.lo: ${HH} gtype-desc.h
build-ggc-none.c: ggc-none.c \
- $(G_GCC_H) gtype-desc.h
+ ${G_GCC_H} gtype-desc.h
+ ${_MKTARGET_CREATE}
rm -f build-ggc-none.c
- sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/ggc-none.c > build-ggc-none.c
-build-ggc-none.o: build-ggc-none.c $(HH)
- ${HOST_COMPILE.c} -DGENERATOR_FILE build-ggc-none.c
+ sed -e 's/config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/ggc-none.c >${.TARGET}
+build-ggc-none.lo: ${HH}
#
# The `early' insn-foo generators
#
-EXTRADEPENDSEARLY= ${G_HOST_EARLY_SUPPORT} ${G_HOST_RTL} ${G_HOST_ERRORS}
+EXTRADEPENDSEARLY= ${G_HOST_EARLY_SUPPORT:.o=.lo} ${G_HOST_RTL:.o=.lo} \
+ ${G_HOST_ERRORS:.o=.lo}
.for f in conditions.c constants.h
CLEANFILES+= gen${f:R} insn-${f}
-gen${f:R}.o: gen${f:R}.c $(HH)
- ${HOST_COMPILE.c} $<
-insn-${f:R}.o:
- ${HOST_COMPILE.c} ${COPTS.${.IMPSRC:T}} insn-${f:R}.c
-insn-${f}: genrtl.h ${G_md_file} ${EXTRADEPENDSEARLY:.c=.o} gen${f:R}.o
- ${HOST_LINK.c} -o gen${f:R} gen${f:R}.o ${EXTRADEPENDSEARLY:.c=.o} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
- ./gen${f:R} ${G_md_file} >$@
+gen${f:R}.lo: gen${f:R}.c ${HH}
+gen${f:R}: gen${f:R}.lo ${EXTRADEPENDSEARLY}
+ ${_MKTARGET_LINK}
+ ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
+insn-${f}: gen${f:R} ${G_md_file}
+ ${_MKTARGET_CREATE}
+ ./gen${f:R} ${G_md_file} >${.TARGET}
.endfor
#
# The normal insn-foo generators
#
.for f in gensupport.c read-rtl.c dummy-conditions.c
-${f:R}.o: ${f:R}.c $(HH)
- ${HOST_COMPILE.c} $<
+${f:R}.lo: ${HH}
.endfor
-EXTRADEPENDS= ${G_HOST_RTL} ${G_HOST_SUPPORT} ${G_HOST_PRINT} ${G_HOST_ERRORS}
+EXTRADEPENDS= ${G_HOST_RTL:.o=.lo} ${G_HOST_SUPPORT:.o=.lo} \
+ ${G_HOST_PRINT:.o=.lo} ${G_HOST_ERRORS:.o=.lo}
.for f in attr.h codes.h config.h emit.c extract.c flags.h opinit.c output.c \
peep.c recog.c
CLEANFILES+= gen${f:R} insn-${f}
-gen${f:R}.o: gen${f:R}.c $(HH)
- ${HOST_COMPILE.c} $<
-insn-${f}: genrtl.h ${G_md_file} ${EXTRADEPENDS:.c=.o} gen${f:R}.o
- ${HOST_LINK.c} -o gen${f:R} gen${f:R}.o ${EXTRADEPENDS:.c=.o} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
- ./gen${f:R} ${G_md_file} >$@
+gen${f:R}.lo: ${HH}
+gen${f:R}: gen${f:R}.lo ${EXTRADEPENDS}
+ ${_MKTARGET_LINK}
+ ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY}
+insn-${f}: gen${f:R} ${G_md_file}
+ ${_MKTARGET_CREATE}
+ ./gen${f:R} ${G_md_file} >${.TARGET}
Home |
Main Index |
Thread Index |
Old Index