diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2002-04-04 18:30:57 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2002-04-04 18:30:57 +0000 |
| commit | fda035bb2c4b56b2cd4545360db7b6e65ba92067 (patch) | |
| tree | b64fb456abe57b9b3233b82c5417ea41893247c4 /gnu/usr.bin | |
| parent | e4753251f77671e7193f1c6bd34fa84fef4042c8 (diff) | |
Notes
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/cc/Makefile.inc | 5 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_int/Makefile | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/Makefile | 86 |
3 files changed, 46 insertions, 51 deletions
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index 97c0bb09b612..d074f9af6886 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -7,12 +7,9 @@ GCCDIR= ${.CURDIR}/../../../../contrib/gcc TARGET_ARCH?= ${MACHINE_ARCH} -GCC_ARCH= ${TARGET_ARCH} # Machine description. -MD_FILE= ${GCCDIR}/config/${GCC_ARCH}/${GCC_ARCH}.md -OUT_FILE= ${GCC_ARCH}.c -OUT_OBJ= ${GCC_ARCH} +MD_FILE= ${GCCDIR}/config/${TARGET_ARCH}/${TARGET_ARCH}.md target= ${TARGET_ARCH}-unknown-freebsd version!= sed -n /version_string/p ${GCCDIR}/version.c | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile index 299ba481ce15..59051ae22dd5 100644 --- a/gnu/usr.bin/cc/cc_int/Makefile +++ b/gnu/usr.bin/cc/cc_int/Makefile @@ -2,7 +2,7 @@ .include "../Makefile.inc" -.PATH: ../cc_tools ${GCCDIR}/config/${GCC_ARCH} ${GCCDIR} +.PATH: ../cc_tools ${GCCDIR}/config/${TARGET_ARCH} ${GCCDIR} LIB= cc_int NOPROFILE= YES @@ -24,7 +24,7 @@ SRCS= c-aux-info.c c-common.c c-convert.c c-format.c \ toplev.c tree.c unroll.c varasm.c version.c xcoffout.c \ alias.c bitmap.c dyn-string.c \ gcse.c genrtl.c profile.c regmove.c varray.c \ - ${OUT_FILE} + ${TARGET_ARCH}.c SRCS+= bb-reorder.c conflict.c ggc-common.c \ ggc-page.c ifcvt.c lists.c predict.c regrename.c resource.c sibcall.c \ @@ -62,6 +62,4 @@ CFLAGS+= -DTARGET_NAME=\"${target}\" -DIN_GCC install: @true -${OUT_OBJ}.o ${OUT_OBJ}.So: ${OUT_FILE} - .include <bsd.lib.mk> diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile index bed52826158f..4818c9d37e89 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -95,22 +95,22 @@ ${COMMONHDRS}: ${.CURDIR}/Makefile configargs.h: echo 'static const char configuration_arguments[] =' > ${.TARGET} - echo ' "FreeBSD/${GCC_ARCH} system compiler";' >> ${.TARGET} + echo ' "FreeBSD/${TARGET_ARCH} system compiler";' >> ${.TARGET} echo 'static const char thread_model[] = "posix";' >> ${.TARGET} config.h hconfig.h: - echo '#include "auto-host.h"' > ${.TARGET} - echo '#include "gansidecl.h"' >> ${.TARGET} - echo '#include "${GCC_ARCH}/xm-${GCC_ARCH}.h"' >> ${.TARGET} - echo '#include "defaults.h"' >> ${.TARGET} - echo '#include "hwint.h"' >> ${.TARGET} - echo '#ifndef POSIX' >> ${.TARGET} - echo '# define POSIX' >> ${.TARGET} - echo '#endif' >> ${.TARGET} - echo '#ifndef GENERATOR_FILE' >> ${.TARGET} - echo '#include "insn-codes.h"' >> ${.TARGET} - echo '#include "insn-flags.h"' >> ${.TARGET} - echo '#endif' >> ${.TARGET} + echo '#include "auto-host.h"' > ${.TARGET} + echo '#include "gansidecl.h"' >> ${.TARGET} + echo '#include "${TARGET_ARCH}/xm-${TARGET_ARCH}.h"' >> ${.TARGET} + echo '#include "defaults.h"' >> ${.TARGET} + echo '#include "hwint.h"' >> ${.TARGET} + echo '#ifndef POSIX' >> ${.TARGET} + echo '# define POSIX' >> ${.TARGET} + echo '#endif' >> ${.TARGET} + echo '#ifndef GENERATOR_FILE' >> ${.TARGET} + echo '#include "insn-codes.h"' >> ${.TARGET} + echo '#include "insn-flags.h"' >> ${.TARGET} + echo '#endif' >> ${.TARGET} gencheck.h: echo '#include "cp/cp-tree.def"' > ${.TARGET} @@ -136,44 +136,44 @@ specs.h: echo '#include "objc/lang-specs.h"' >> ${.TARGET} tconfig.h: - echo '#include "gansidecl.h"' > ${.TARGET} - echo '#include "${GCC_ARCH}/xm-${GCC_ARCH}.h"' >> ${.TARGET} - echo '#include "defaults.h"' >> ${.TARGET} - echo '#ifndef GENERATOR_FILE' >> ${.TARGET} - echo '#include "insn-codes.h"' >> ${.TARGET} - echo '#include "insn-flags.h"' >> ${.TARGET} - echo '#endif' >> ${.TARGET} - echo '#define USING_SJLJ_EXCEPTIONS 0' >> ${.TARGET} + echo '#include "gansidecl.h"' > ${.TARGET} + echo '#include "${TARGET_ARCH}/xm-${TARGET_ARCH}.h"' >> ${.TARGET} + echo '#include "defaults.h"' >> ${.TARGET} + echo '#ifndef GENERATOR_FILE' >> ${.TARGET} + echo '#include "insn-codes.h"' >> ${.TARGET} + echo '#include "insn-flags.h"' >> ${.TARGET} + echo '#endif' >> ${.TARGET} + echo '#define USING_SJLJ_EXCEPTIONS 0' >> ${.TARGET} # KEEP THIS IN SYNC with src/gcc/lib/libgcc/Makefile !! tm.h: - echo '#include "gansidecl.h"' > ${.TARGET} - echo '#include "${GCC_ARCH}/${GCC_ARCH}.h"' >> ${.TARGET} -.if ${GCC_ARCH} == "i386" - echo '#include "${GCC_ARCH}/att.h"' >> ${.TARGET} + echo '#include "gansidecl.h"' > ${.TARGET} + echo '#include "${TARGET_ARCH}/${TARGET_ARCH}.h"' >> ${.TARGET} +.if ${TARGET_ARCH} == "i386" + echo '#include "${TARGET_ARCH}/att.h"' >> ${.TARGET} .endif - echo '#include <freebsd-native.h>' >> ${.TARGET} - echo '#include <freebsd.h>' >> ${.TARGET} -.if exists(${GCCDIR}/config/${GCC_ARCH}/elf.h) - echo '#include "${GCC_ARCH}/elf.h"' >> ${.TARGET} + echo '#include <freebsd-native.h>' >> ${.TARGET} + echo '#include <freebsd.h>' >> ${.TARGET} +.if exists(${GCCDIR}/config/${TARGET_ARCH}/elf.h) + echo '#include "${TARGET_ARCH}/elf.h"' >> ${.TARGET} .endif - echo '#include "${GCC_ARCH}/freebsd.h"' >> ${.TARGET} -.if ${GCC_ARCH} == "i386" - echo '#include "${GCC_ARCH}/perform.h"' >> ${.TARGET} + echo '#include "${TARGET_ARCH}/freebsd.h"' >> ${.TARGET} +.if ${TARGET_ARCH} == "i386" + echo '#include "${TARGET_ARCH}/perform.h"' >> ${.TARGET} .endif - echo '#include "defaults.h"' >> ${.TARGET} - echo '#ifndef GENERATOR_FILE' >> ${.TARGET} - echo '#include "insn-codes.h"' >> ${.TARGET} - echo '#include "insn-flags.h"' >> ${.TARGET} - echo '#endif' >> ${.TARGET} + echo '#include "defaults.h"' >> ${.TARGET} + echo '#ifndef GENERATOR_FILE' >> ${.TARGET} + echo '#include "insn-codes.h"' >> ${.TARGET} + echo '#include "insn-flags.h"' >> ${.TARGET} + echo '#endif' >> ${.TARGET} tm_p.h: - echo '#include "${GCC_ARCH}/${GCC_ARCH}-protos.h"' > ${.TARGET} - echo '#include <freebsd-native.h>' >> ${.TARGET} - echo '#ifndef GENERATOR_FILE' >> ${.TARGET} - echo '#include "insn-codes.h"' >> ${.TARGET} - echo '#include "insn-flags.h"' >> ${.TARGET} - echo '#endif' >> ${.TARGET} + echo '#include "${TARGET_ARCH}/${TARGET_ARCH}-protos.h"' > ${.TARGET} + echo '#include <freebsd-native.h>' >> ${.TARGET} + echo '#ifndef GENERATOR_FILE' >> ${.TARGET} + echo '#include "insn-codes.h"' >> ${.TARGET} + echo '#include "insn-flags.h"' >> ${.TARGET} + echo '#endif' >> ${.TARGET} #----------------------------------------------------------------------- # General things. |
