diff options
author | jb <jb@FreeBSD.org> | 1998-01-25 09:49:00 +0000 |
---|---|---|
committer | jb <jb@FreeBSD.org> | 1998-01-25 09:49:00 +0000 |
commit | b1946a832022561f114688778ae36cec4d94316f (patch) | |
tree | f46efc9d89da2a571d64932482eed196b8677fbf /gnu | |
parent | d9c8ef59e82063aa86881730fc33fa1d984d2ae2 (diff) | |
download | FreeBSD-src-b1946a832022561f114688778ae36cec4d94316f.zip FreeBSD-src-b1946a832022561f114688778ae36cec4d94316f.tar.gz |
Change MACHINE -> MACHINE_ARCH so that the design make sense on those
machines where the processor chip determines the compiler, and where
multiple machines use the same architecture.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/usr.bin/cc/Makefile.inc | 14 | ||||
-rw-r--r-- | gnu/usr.bin/cc/cc_tools/Makefile | 30 |
2 files changed, 22 insertions, 22 deletions
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc index 3707b2d..0284d7d 100644 --- a/gnu/usr.bin/cc/Makefile.inc +++ b/gnu/usr.bin/cc/Makefile.inc @@ -1,5 +1,5 @@ # -# $Id: Makefile.inc,v 1.20 1997/03/28 04:45:30 jdp Exp $ +# $Id: Makefile.inc,v 1.21 1998/01/11 04:10:26 jb Exp $ # # Sometimes this is .include'd several times... @@ -10,10 +10,10 @@ GCCDIR= ${.CURDIR}/../../../../contrib/gcc BISON?= bison # Machine description. -MD_FILE= ${GCCDIR}/config/${MACHINE}/${MACHINE}.md -OUT_FILE= ${MACHINE}.c -OUT_OBJ= ${MACHINE} -.PATH: ${GCCDIR}/config/${MACHINE} +MD_FILE= ${GCCDIR}/config/${MACHINE_ARCH}/${MACHINE_ARCH}.md +OUT_FILE= ${MACHINE_ARCH}.c +OUT_OBJ= ${MACHINE_ARCH} +.PATH: ${GCCDIR}/config/${MACHINE_ARCH} .if ${MACHINE} == "alpha" BINFORMAT= elf @@ -25,11 +25,11 @@ BINFORMAT?= aout .if ${BINFORMAT} == aout CFLAGS+= -DFREEBSD_AOUT -target= ${MACHINE}-unknown-freebsd +target= ${MACHINE_ARCH}-unknown-freebsd .endif .if ${BINFORMAT} == elf CFLAGS+= -DFREEBSD_ELF -target= ${MACHINE}-unknown-freebsdelf +target= ${MACHINE_ARCH}-unknown-freebsdelf .endif version!= sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${GCCDIR}/version.c diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile index 6fd2add..c99d07b 100644 --- a/gnu/usr.bin/cc/cc_tools/Makefile +++ b/gnu/usr.bin/cc/cc_tools/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.4 1997/10/05 09:39:07 jkh Exp $ +# $Id: Makefile,v 1.5 1998/01/11 04:13:25 jb Exp $ # # @@ -131,24 +131,24 @@ beforedepend: ${BINFORMAT} aout: @rm -f elf - echo '#include "${MACHINE}/freebsd.h"' > tm.h - echo '#include "${MACHINE}/xm-freebsd.h"' > config.h - echo '#include "${MACHINE}/xm-freebsd.h"' > hconfig.h - echo '#include "${MACHINE}/xm-freebsd.h"' > tconfig.h - echo '#include "cp/lang-options.h"' > options.h - echo '#include "cp/lang-specs.h"' > specs.h - echo '#include "f2c-specs.h"' >> specs.h + echo '#include "${MACHINE_ARCH}/freebsd.h"' > tm.h + echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > config.h + echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > hconfig.h + echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > tconfig.h + echo '#include "cp/lang-options.h"' > options.h + echo '#include "cp/lang-specs.h"' > specs.h + echo '#include "f2c-specs.h"' >> specs.h @touch aout elf: @rm -f aout - echo '#include "${MACHINE}/freebsd-elf.h"' > tm.h - echo '#include "${MACHINE}/xm-freebsd.h"' > config.h - echo '#include "${MACHINE}/xm-freebsd.h"' > hconfig.h - echo '#include "${MACHINE}/xm-freebsd.h"' > tconfig.h - echo '#include "cp/lang-options.h"' > options.h - echo '#include "cp/lang-specs.h"' > specs.h - echo '#include "f2c-specs.h"' >> specs.h + echo '#include "${MACHINE_ARCH}/freebsd-elf.h"' > tm.h + echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > config.h + echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > hconfig.h + echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > tconfig.h + echo '#include "cp/lang-options.h"' > options.h + echo '#include "cp/lang-specs.h"' > specs.h + echo '#include "f2c-specs.h"' >> specs.h @touch elf CLEANFILES+= config.h hconfig.h tconfig.h tm.h options.h specs.h elf aout |