diff options
| author | imp <imp@FreeBSD.org> | 2010-08-23 01:43:47 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-08-23 01:43:47 +0000 |
| commit | dab222df9beb85e31cb089b27d23fb1e86a23ab6 (patch) | |
| tree | 59385ec7afb4a6ca654ba7d7eb13c1de38782d9d /sys/boot/common | |
| parent | 39fcadc28da59792c2ac5650c1f0202b2c16b596 (diff) | |
| download | FreeBSD-src-dab222df9beb85e31cb089b27d23fb1e86a23ab6.zip FreeBSD-src-dab222df9beb85e31cb089b27d23fb1e86a23ab6.tar.gz | |
MF tbemd: Minor tweaks, prefer MACHINE_CPUARCH generally to MACHINE_ARCH (which simplifies some powerpc/powerpc64 ifs)
Diffstat (limited to 'sys/boot/common')
| -rw-r--r-- | sys/boot/common/Makefile.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc index 6b4c769..ff3ec39 100644 --- a/sys/boot/common/Makefile.inc +++ b/sys/boot/common/Makefile.inc @@ -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 |
