From owner-svn-src-projects@FreeBSD.ORG Wed Jan 30 00:40:30 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 09361DD5; Wed, 30 Jan 2013 00:40:30 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EF3EC26A; Wed, 30 Jan 2013 00:40:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0U0eTos017446; Wed, 30 Jan 2013 00:40:29 GMT (envelope-from benno@svn.freebsd.org) Received: (from benno@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0U0eT8j017440; Wed, 30 Jan 2013 00:40:29 GMT (envelope-from benno@svn.freebsd.org) Message-Id: <201301300040.r0U0eT8j017440@svn.freebsd.org> From: Benno Rice Date: Wed, 30 Jan 2013 00:40:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246102 - in projects/uefi: . sys/boot/i386/gptboot sys/boot/i386/gptzfsboot sys/boot/i386/loader sys/boot/i386/zfsboot X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2013 00:40:30 -0000 Author: benno Date: Wed Jan 30 00:40:28 2013 New Revision: 246102 URL: http://svnweb.freebsd.org/changeset/base/246102 Log: Rewire non-EFI boot code to use the 32-bit libstand out of /usr/lib32. This hasn't been tested yet. Sponsored by: FreeBSD Foundation Modified: projects/uefi/UEFI-TODO.txt projects/uefi/sys/boot/i386/gptboot/Makefile projects/uefi/sys/boot/i386/gptzfsboot/Makefile projects/uefi/sys/boot/i386/loader/Makefile projects/uefi/sys/boot/i386/zfsboot/Makefile Modified: projects/uefi/UEFI-TODO.txt ============================================================================== --- projects/uefi/UEFI-TODO.txt Wed Jan 30 00:16:59 2013 (r246101) +++ projects/uefi/UEFI-TODO.txt Wed Jan 30 00:40:28 2013 (r246102) @@ -3,7 +3,7 @@ Part the First: 64-bit EFI loader + Make libstand build natively as 64-bit on amd64. -- Adjust non-EFI boot code to use /usr/lib32/libstand.a. ++ Adjust non-EFI boot code to use /usr/lib32/libstand.a. - Test that the other boot code still actually works. - Add bits to build 64-bit loader.efi. - Make sure that loader.efi can actually load a kernel and hand off to it. Modified: projects/uefi/sys/boot/i386/gptboot/Makefile ============================================================================== --- projects/uefi/sys/boot/i386/gptboot/Makefile Wed Jan 30 00:16:59 2013 (r246101) +++ projects/uefi/sys/boot/i386/gptboot/Makefile Wed Jan 30 00:40:28 2013 (r246102) @@ -37,6 +37,10 @@ CFLAGS= -DBOOTPROG=\"gptboot\" \ -Winline --param max-inline-insns-single=100 LDFLAGS=-static -N --gc-sections +.if ${MACHINE_CPUARCH} == "amd64" +LDFLAGS+= -m elf_i386_fbsd +LIBSTAND= /usr/lib32/libstand.a +.endif # Pick up ../Makefile.inc early. .include Modified: projects/uefi/sys/boot/i386/gptzfsboot/Makefile ============================================================================== --- projects/uefi/sys/boot/i386/gptzfsboot/Makefile Wed Jan 30 00:16:59 2013 (r246101) +++ projects/uefi/sys/boot/i386/gptzfsboot/Makefile Wed Jan 30 00:40:28 2013 (r246102) @@ -36,6 +36,11 @@ CFLAGS= -DBOOTPROG=\"gptzfsboot\" \ LDFLAGS=-static -N --gc-sections +.if ${MACHINE_CPUARCH} == "amd64" +LDFLAGS+= -m elf_i386_fbsd +LIBSTAND= /usr/lib32/libstand.a +.endif + # Pick up ../Makefile.inc early. .include Modified: projects/uefi/sys/boot/i386/loader/Makefile ============================================================================== --- projects/uefi/sys/boot/i386/loader/Makefile Wed Jan 30 00:16:59 2013 (r246101) +++ projects/uefi/sys/boot/i386/loader/Makefile Wed Jan 30 00:40:28 2013 (r246102) @@ -65,6 +65,11 @@ CLEANFILES= vers.c ${LOADER} ${LOADER}.b CFLAGS+= -Wall LDFLAGS= -static -Ttext 0x0 +.if ${MACHINE_CPUARCH} == "amd64" +LDFLAGS+= -Wl,-m,elf_i386_fbsd +LIBSTAND= /usr/lib32/libstand.a +.endif + # i386 standalone support library LIBI386= ${.OBJDIR}/../libi386/libi386.a CFLAGS+= -I${.CURDIR}/.. Modified: projects/uefi/sys/boot/i386/zfsboot/Makefile ============================================================================== --- projects/uefi/sys/boot/i386/zfsboot/Makefile Wed Jan 30 00:16:59 2013 (r246101) +++ projects/uefi/sys/boot/i386/zfsboot/Makefile Wed Jan 30 00:40:28 2013 (r246102) @@ -33,6 +33,11 @@ CFLAGS= -DBOOTPROG=\"zfsboot\" \ LDFLAGS=-static -N --gc-sections +.if ${MACHINE_CPUARCH} == "amd64" +LDFLAGS+= -m elf_i386_fbsd +LIBSTAND= /usr/lib32/libstand.a +.endif + # Pick up ../Makefile.inc early. .include