svn commit: r292561 - in stable/10/sys/boot/amd64: boot1.efi efi

[Ed Maste]

Author: emaste
Date: Mon Dec 21 19:40:32 2015
New Revision: 292561
URL: https://svnweb.freebsd.org/changeset/base/292561

Log:
  MFC r276146: 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:
  stable/10/sys/boot/amd64/boot1.efi/Makefile
  stable/10/sys/boot/amd64/efi/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/amd64/boot1.efi/Makefile
==============================================================================
--- stable/10/sys/boot/amd64/boot1.efi/Makefile	Mon Dec 21 19:25:27 2015	(r292560)
+++ stable/10/sys/boot/amd64/boot1.efi/Makefile	Mon Dec 21 19:40:32 2015	(r292561)
@@ -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: stable/10/sys/boot/amd64/efi/Makefile
==============================================================================
--- stable/10/sys/boot/amd64/efi/Makefile	Mon Dec 21 19:25:27 2015	(r292560)
+++ stable/10/sys/boot/amd64/efi/Makefile	Mon Dec 21 19:40:32 2015	(r292561)
@@ -92,7 +92,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