From owner-svn-src-head@FreeBSD.ORG  Tue Dec 23 15:58:46 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ABE2B99;
 Tue, 23 Dec 2014 15:58:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 979FA64B00;
 Tue, 23 Dec 2014 15:58:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBNFwkN4001056;
 Tue, 23 Dec 2014 15:58:46 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBNFwkMZ001054;
 Tue, 23 Dec 2014 15:58:46 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201412231558.sBNFwkMZ001054@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 23 Dec 2014 15:58:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276146 - in head/sys/boot/amd64: boot1.efi efi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Dec 2014 15:58:46 -0000

Author: emaste
Date: Tue Dec 23 15:58:45 2014
New Revision: 276146
URL: https://svnweb.freebsd.org/changeset/base/276146

Log:
  Use explicit --output-target to set EFI file format
  
  According to objcopy(1) --target is for use where the input and output
  formats are the same ("no translation"). In practice it does detect the
  input format in any case, but be explicit that we're specifying the
  output format as we are translating from ELF to EFI PE format.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/boot/amd64/boot1.efi/Makefile
  head/sys/boot/amd64/efi/Makefile

Modified: head/sys/boot/amd64/boot1.efi/Makefile
==============================================================================
--- head/sys/boot/amd64/boot1.efi/Makefile	Tue Dec 23 15:42:34 2014	(r276145)
+++ head/sys/boot/amd64/boot1.efi/Makefile	Tue Dec 23 15:58:45 2014	(r276146)
@@ -51,7 +51,7 @@ boot1.efi: loader.sym
 	${OBJCOPY} -j .text -j .sdata -j .data \
 		-j .dynamic -j .dynsym -j .rel.dyn \
 		-j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \
-		--target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
+		--output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
 
 CFLAGS+=	-I${.CURDIR}/../../common
 

Modified: head/sys/boot/amd64/efi/Makefile
==============================================================================
--- head/sys/boot/amd64/efi/Makefile	Tue Dec 23 15:42:34 2014	(r276145)
+++ head/sys/boot/amd64/efi/Makefile	Tue Dec 23 15:58:45 2014	(r276146)
@@ -81,7 +81,7 @@ loader.efi: loader.sym
 	${OBJCOPY} -j .text -j .sdata -j .data \
 		-j .dynamic -j .dynsym -j .rel.dyn \
 		-j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \
-		--target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
+		--output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET}
 
 LIBEFI=		${.OBJDIR}/../../efi/libefi/libefi.a
 CFLAGS+=	-I${.CURDIR}/../../common