Date: Fri, 1 Mar 2013 07:00:11 +0000 (UTC) From: Benno Rice <benno@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r247532 - projects/uefi/sys/boot/common Message-ID: <201303010700.r2170Bfi033876@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: benno Date: Fri Mar 1 07:00:11 2013 New Revision: 247532 URL: http://svnweb.freebsd.org/changeset/base/247532 Log: Build both 32- and 64-bit ELF loaders on both amd64 and i386. This is needed because otherwise we don't build the 32-bit ELF loader for the i386 loader code used to boot amd64 under BIOS. Modified: projects/uefi/sys/boot/common/Makefile.inc Modified: projects/uefi/sys/boot/common/Makefile.inc ============================================================================== --- projects/uefi/sys/boot/common/Makefile.inc Fri Mar 1 06:57:45 2013 (r247531) +++ projects/uefi/sys/boot/common/Makefile.inc Fri Mar 1 07:00:11 2013 (r247532) @@ -4,11 +4,9 @@ SRCS+= boot.c commands.c console.c devop SRCS+= interp_backslash.c interp_parse.c ls.c misc.c SRCS+= module.c panic.c -.if ${MACHINE} == "i386" +.if ${MACHINE_CPUARCH} == "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_CPUARCH} == "amd64" -SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c .elif ${MACHINE_CPUARCH} == "ia64" SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c .elif ${MACHINE} == "pc98"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303010700.r2170Bfi033876>