Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use MACHINE, not TARGET_MACHINE.

Browse Source
This commit is contained in:
thorpej 2001-10-23 18:57:32 +00:00
parent b2cb6c26ef
commit 2c5ebcddfb
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/arm/conf/Makefile.arm
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.arm,v 1.8 2001/10/23 17:32:35 thorpej Exp $
# $NetBSD: Makefile.arm,v 1.9 2001/10/23 18:57:32 thorpej Exp $
# Makefile for NetBSD
#
@ -38,12 +38,12 @@ S!= cd ../../../..; pwd
ARM32= $S/arch/arm32
ARM= $S/arch/arm
THISARM= $S/arch/${TARGET_MACHINE}
THISARM= $S/arch/${MACHINE}
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I./include -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} \
-D_KERNEL -D_KERNEL_OPT -D${TARGET_MACHINE}
-D_KERNEL -D_KERNEL_OPT -D${MACHINE}
CWARNFLAGS?= -Werror -Wall -Wcomment -Wpointer-arith
# XXX Delete -Wuninitialized for now, since the compiler doesn't
# XXX always get it right. --thorpej
@ -59,8 +59,8 @@ LINKENTRY?= -e start
LINKFLAGS= -Ttext ${LOADADDRESS} ${LINKENTRY} ${EXTRA_LINKFLAGS}
STRIPFLAGS= -g
.if exists($S/arch/${TARGET_MACHINE}/conf/Makefile.${TARGET_MACHINE}.inc)
.include "$S/arch/${TARGET_MACHINE}/conf/Makefile.${TARGET_MACHINE}.inc"
.if exists($S/arch/${MACHINE}/conf/Makefile.${MACHINE}.inc)
.include "$S/arch/${MACHINE}/conf/Makefile.${MACHINE}.inc"
.endif
%INCLUDES
@ -199,10 +199,10 @@ include-dir:
@rm -rf include
@mkdir -p include/arm
.if (${S} == "../../../..")
@(cd include/arm; ln -s ../../$S/arch/${TARGET_MACHINE}/include ${TARGET_MACHINE})
@(cd include/arm; ln -s ../../$S/arch/${MACHINE}/include ${MACHINE})
@(cd include; ln -s ../$S/arch/arm/include machine)
.else
@ln -s $S/arch/${TARGET_MACHINE}/include include/arm/${TARGET_MACHINE}
@ln -s $S/arch/${MACHINE}/include include/arm/${MACHINE}
@ln -s $S/arch/arm/include include/machine
.endif
.endif

12
sys/arch/mips/conf/Makefile.mips
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.mips,v 1.20 2001/10/16 16:31:32 uch Exp $
# $NetBSD: Makefile.mips,v 1.21 2001/10/23 18:57:32 thorpej Exp $
# Makefile for NetBSD
#
@ -41,13 +41,13 @@ TEXTADDR?= ${DEFTEXTADDR}
.ifndef S
S= ../../../..
.endif
THISMIPS= $S/arch/${TARGET_MACHINE}
THISMIPS= $S/arch/${MACHINE}
MIPS= $S/arch/mips
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT \
-D${TARGET_MACHINE}
-D${MACHINE}
CWARNFLAGS?= -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes \
-Wpointer-arith
# XXX Delete -Wuninitialized for now, since the compiler doesn't
@ -70,7 +70,7 @@ LINKFLAGS+= --oformat elf32-littlemips
.endif
STRIPFLAGS= -g -X -x
.-include "${THISMIPS}/conf/Makefile.${TARGET_MACHINE}.inc"
.-include "${THISMIPS}/conf/Makefile.${MACHINE}.inc"
%INCLUDES
@ -212,7 +212,7 @@ SRCS+= ${MIPS}/mips/r5900/locore_r5900.S ${MIPS}/mips/r5900/r5900_machdep.c
SFILES+=${MIPS}/mips/fp.S
.endif
SFILES+=${MIPS}/mips/locore.S \
${THISMIPS}/${TARGET_MACHINE}/locore_machdep.S
${THISMIPS}/${MACHINE}/locore_machdep.S
SRCS= param.c ioconf.c ${CFILES} ${SFILES}
depend: .depend
@ -262,7 +262,7 @@ fp.o: ${MIPS}/mips/fp.S assym.h
${NORMAL_S}
.endif
locore_machdep.o: ${THISMIPS}/${TARGET_MACHINE}/locore_machdep.S assym.h
locore_machdep.o: ${THISMIPS}/${MACHINE}/locore_machdep.S assym.h
${NORMAL_S}
# The install target can be redefined by putting a

4
sys/arch/netwinder/conf/Makefile.netwinder.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.netwinder.inc,v 1.1 2001/06/11 17:46:23 matt Exp $
# $NetBSD: Makefile.netwinder.inc,v 1.2 2001/10/23 18:57:32 thorpej Exp $
SYSTEM_FIRST_OBJ= nwmmu.o
SYSTEM_FIRST_SFILE= ${THISARM}/${TARGET_MACHINE}/nwmmu.S
SYSTEM_FIRST_SFILE= ${THISARM}/${MACHINE}/nwmmu.S

24
sys/arch/powerpc/conf/Makefile.powerpc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.powerpc,v 1.16 2001/10/21 21:13:11 thorpej Exp $
# $NetBSD: Makefile.powerpc,v 1.17 2001/10/23 18:57:33 thorpej Exp $
#
# Makefile for NetBSD
#
@ -45,12 +45,12 @@ TEXTADDR?= 0x100000
.ifndef S
S!= cd ../../../..; pwd
.endif
THISPPC= $S/arch/${TARGET_MACHINE}
THISPPC= $S/arch/${MACHINE}
POWERPC= $S/arch/powerpc
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} \
-D_KERNEL -D_KERNEL_OPT -D${TARGET_MACHINE}
-D_KERNEL -D_KERNEL_OPT -D${MACHINE}
CWARNFLAGS?= -Werror -Wall -Wreturn-type -Wpointer-arith -Wno-main \
-Wmissing-prototypes -Wstrict-prototypes
# XXX Delete -Wuninitialized for now, since the compiler doesn't
@ -61,8 +61,8 @@ AFLAGS= -D_LOCORE ${AOPTS}
LINKFLAGS= -N -Ttext ${TEXTADDR} -e __start
STRIPFLAGS= --strip-debug
.if exists(${THISPPC}/conf/Makefile.${TARGET_MACHINE}.inc)
.include "${THISPPC}/conf/Makefile.${TARGET_MACHINE}.inc"
.if exists(${THISPPC}/conf/Makefile.${MACHINE}.inc)
.include "${THISPPC}/conf/Makefile.${MACHINE}.inc"
.endif
%INCLUDES
@ -126,9 +126,9 @@ SYSTEM_LD_TAIL+=; \
%LOAD
assym.h: $S/kern/genassym.sh ${THISPPC}/${TARGET_MACHINE}/genassym.cf
assym.h: $S/kern/genassym.sh ${THISPPC}/${MACHINE}/genassym.cf
sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
< ${THISPPC}/${TARGET_MACHINE}/genassym.cf > assym.h.tmp && \
< ${THISPPC}/${MACHINE}/genassym.cf > assym.h.tmp && \
mv -f assym.h.tmp assym.h
param.c: $S/conf/param.c
@ -159,7 +159,7 @@ cleandir distclean: __CLEANKERNEL __CLEANDEPEND
lint:
@lint -hbxncez -Dvolatile= ${CPPFLAGS} -UKGDB \
${THISPPC}/${TARGET_MACHINE}/Locore.c ${CFILES} \
${THISPPC}/${MACHINE}/Locore.c ${CFILES} \
ioconf.c param.c | \
grep -v 'static function .* unused'
@ -174,17 +174,17 @@ links:
sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
sh makelinks && rm -f dontlink
SRCS= ${THISPPC}/${TARGET_MACHINE}/locore.S \
SRCS= ${THISPPC}/${MACHINE}/locore.S \
param.c ioconf.c ${CFILES} ${SFILES}
depend: .depend
.depend: ${SRCS} assym.h param.c
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${THISPPC}/${TARGET_MACHINE}/locore.S
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${THISPPC}/${MACHINE}/locore.S
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
.if ${SFILES} != ""
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
.endif
sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
${CPPFLAGS} < ${THISPPC}/${TARGET_MACHINE}/genassym.cf
${CPPFLAGS} < ${THISPPC}/${MACHINE}/genassym.cf
@sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
@rm -f assym.dep
@ -202,7 +202,7 @@ machdep.o: Makefile
# depend on CPU configuration
locore.o machdep.o: Makefile
locore.o: ${THISPPC}/${TARGET_MACHINE}/locore.S assym.h
locore.o: ${THISPPC}/${MACHINE}/locore.S assym.h
${NORMAL_S}
# The install target can be redefined by putting a

22
sys/arch/sh3/conf/Makefile.sh3
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.sh3,v 1.12 2001/05/29 02:20:25 mrg Exp $
# $NetBSD: Makefile.sh3,v 1.13 2001/10/23 18:57:33 thorpej Exp $
# Makefile for NetBSD
#
@ -39,12 +39,12 @@ COPTS?= -O1
.ifndef S
S!= cd ../../../..; pwd
.endif
THISSH3=$S/arch/${TARGET_MACHINE}
THISSH3=$S/arch/${MACHINE}
SH3= $S/arch/sh3
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT -D${TARGET_MACHINE}
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT -D${MACHINE}
CWARNFLAGS= -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes
CWARNFLAGS+= -Wpointer-arith -Wno-parentheses
# XXX Delete -Wuninitialized for now, since the compiler doesn't
@ -58,8 +58,8 @@ AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE
LINKFLAGS?= -e start -T ${THISSH3}/conf/${LDSCRIPTBASE}
STRIPFLAGS= --strip-debug
.if exists(${THISSH3}/conf/Makefile.${TARGET_MACHINE}.inc)
.include "${THISSH3}/conf/Makefile.${TARGET_MACHINE}.inc"
.if exists(${THISSH3}/conf/Makefile.${MACHINE}.inc)
.include "${THISSH3}/conf/Makefile.${MACHINE}.inc"
.endif
%INCLUDES
@ -118,9 +118,9 @@ LINKFLAGS+=
%LOAD
assym.h: $S/kern/genassym.sh ${THISSH3}/${TARGET_MACHINE}/genassym.cf
assym.h: $S/kern/genassym.sh ${THISSH3}/${MACHINE}/genassym.cf
sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
< ${THISSH3}/${TARGET_MACHINE}/genassym.cf > assym.h.tmp && \
< ${THISSH3}/${MACHINE}/genassym.cf > assym.h.tmp && \
mv -f assym.h.tmp assym.h
param.c: $S/conf/param.c
@ -168,17 +168,17 @@ links:
sh makelinks && rm -f dontlink
# ${SH3}/sh3/locore.s ?
SRCS= ${THISSH3}/${TARGET_MACHINE}/locore.s \
SRCS= ${THISSH3}/${MACHINE}/locore.s \
param.c ioconf.c ${CFILES} ${SFILES}
depend: .depend
.depend: ${SRCS} assym.h param.c
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${THISSH3}/${TARGET_MACHINE}/locore.s
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${THISSH3}/${MACHINE}/locore.s
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
.if ${SFILES} != ""
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
.endif
sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
${CPPFLAGS} < ${THISSH3}/${TARGET_MACHINE}/genassym.cf
${CPPFLAGS} < ${THISSH3}/${MACHINE}/genassym.cf
@sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >> .depend
@rm -f assym.dep
@ -197,7 +197,7 @@ machdep.o: Makefile
# depend on CPU configuration
locore.o machdep.o: Makefile
locore.o: ${THISSH3}/${TARGET_MACHINE}/locore.s assym.h
locore.o: ${THISSH3}/${MACHINE}/locore.s assym.h
${NORMAL_S}
# XXX compile ffs_inode.c always with -O0 to avoid egcs-1.1.2 bug.