mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
MF tbemd: Minor tweaks, prefer MACHINE_CPUARCH generally to MACHINE_ARCH (which simplifies some powerpc/powerpc64 ifs)
This commit is contained in:
parent
5aae6977bc
commit
343bc19749
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=211678
|
@ -4,17 +4,17 @@ SRCS+= boot.c commands.c console.c devopen.c interp.c
|
|||
SRCS+= interp_backslash.c interp_parse.c ls.c misc.c
|
||||
SRCS+= module.c panic.c
|
||||
|
||||
.if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "amd64"
|
||||
.if ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "amd64"
|
||||
SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c
|
||||
SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c
|
||||
.elif ${MACHINE} == "pc98"
|
||||
SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c
|
||||
.elif ${MACHINE_ARCH} == "arm"
|
||||
.elif ${MACHINE_ARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm"
|
||||
SRCS+= load_elf32.c reloc_elf32.c
|
||||
.elif ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
|
||||
.elif ${MACHINE_CPUARCH} == "powerpc"
|
||||
SRCS+= load_elf32.c reloc_elf32.c
|
||||
SRCS+= load_elf64.c reloc_elf64.c
|
||||
.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64"
|
||||
.elif ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "ia64"
|
||||
SRCS+= load_elf64.c reloc_elf64.c
|
||||
.endif
|
||||
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
# $FreeBSD$
|
||||
#
|
||||
.PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/:S/powerpc64/powerpc/}
|
||||
.PATH: ${.CURDIR}/${MACHINE_CPUARCH:S/amd64/i386/}
|
||||
BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \
|
||||
prefix.c search.c stack.c tools.c vm.c words.c
|
||||
|
||||
SRCS= ${BASE_SRCS} sysdep.c softcore.c
|
||||
CLEANFILES= softcore.c testmain testmain.o
|
||||
CFLAGS+= -ffreestanding
|
||||
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
|
||||
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
|
||||
CFLAGS+= -mpreferred-stack-boundary=2
|
||||
CFLAGS+= -mno-mmx -mno-3dnow -mno-sse -mno-sse2
|
||||
.endif
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
.if ${MACHINE_CPUARCH} == "i386"
|
||||
CFLAGS+= -mno-sse3
|
||||
.endif
|
||||
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "arm"
|
||||
.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "arm"
|
||||
CFLAGS+= -msoft-float
|
||||
.endif
|
||||
.if ${MACHINE} == "pc98"
|
||||
|
@ -41,7 +41,7 @@ SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
|
|||
# Optional OO extension softwords
|
||||
#SOFTWORDS+= oo.fr classes.fr
|
||||
|
||||
.if ${MACHINE_ARCH} == "amd64"
|
||||
.if ${MACHINE_CPUARCH} == "amd64"
|
||||
CFLAGS+= -m32 -march=i386 -I.
|
||||
.endif
|
||||
|
||||
|
@ -49,14 +49,14 @@ CFLAGS+= -m32 -march=i386 -I.
|
|||
CFLAGS+= -m32 -mcpu=powerpc -I.
|
||||
.endif
|
||||
|
||||
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/:S/powerpc64/powerpc/} \
|
||||
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${MACHINE_CPUARCH:S/amd64/i386/} \
|
||||
-I${.CURDIR}/../common
|
||||
|
||||
softcore.c: ${SOFTWORDS} softcore.awk
|
||||
(cd ${.CURDIR}/softwords; cat ${SOFTWORDS} \
|
||||
| awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
|
||||
|
||||
.if ${MACHINE_ARCH} == "amd64"
|
||||
.if ${MACHINE_CPUARCH} == "amd64"
|
||||
${SRCS:M*.c:R:S/$/.o/g}: machine
|
||||
|
||||
beforedepend ${OBJS}: machine
|
||||
|
|
Loading…
Reference in a new issue