svn commit: r293599 - in stable/10/sys: conf modules/linux modules/linux64

[Dmitry Chagin]

Author: dchagin
Date: Sat Jan  9 18:06:38 2016
New Revision: 293599
URL: https://svnweb.freebsd.org/changeset/base/293599

Log:
  MFC r283506 (by rodrigc):
  
  For objcopy, use --input-target and --output-target
  
  When building with gcc 4.9 and binutils 2.25,
  using '--input' and '--output' returns an error
  message:
     objcopy: option `--input' is ambiguous

Modified:
  stable/10/sys/conf/files.amd64
  stable/10/sys/conf/files.i386
  stable/10/sys/modules/linux/Makefile
  stable/10/sys/modules/linux64/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/conf/files.amd64
==============================================================================
--- stable/10/sys/conf/files.amd64	Sat Jan  9 18:05:04 2016	(r293598)
+++ stable/10/sys/conf/files.amd64	Sat Jan  9 18:06:38 2016	(r293599)
@@ -28,7 +28,7 @@ linux32_locore.o	optional	compat_linux32
 #
 linux32_vdso.so		optional	compat_linux32			\
 	dependency 	"linux32_locore.o"				\
-	compile-with	"${OBJCOPY} --input binary --output elf64-x86-64-freebsd --binary-architecture i386 linux32_locore.o ${.TARGET}" \
+	compile-with	"${OBJCOPY} --input-target binary --output-target elf64-x86-64-freebsd --binary-architecture i386 linux32_locore.o ${.TARGET}" \
 	no-implicit-rule						\
 	clean		"linux32_vdso.so"
 #

Modified: stable/10/sys/conf/files.i386
==============================================================================
--- stable/10/sys/conf/files.i386	Sat Jan  9 18:05:04 2016	(r293598)
+++ stable/10/sys/conf/files.i386	Sat Jan  9 18:06:38 2016	(r293599)
@@ -27,7 +27,7 @@ linux_locore.o			optional	compat_linux		
 #
 linux_vdso.so			optional	compat_linux		\
 	dependency 	"linux_locore.o"				\
-	compile-with	"${OBJCOPY} --input binary --output elf32-i386-freebsd --binary-architecture i386 linux_locore.o ${.TARGET}" \
+	compile-with	"${OBJCOPY} --input-target binary --output-target elf32-i386-freebsd --binary-architecture i386 linux_locore.o ${.TARGET}" \
 	no-implicit-rule						\
 	clean		"linux_vdso.so"
 #

Modified: stable/10/sys/modules/linux/Makefile
==============================================================================
--- stable/10/sys/modules/linux/Makefile	Sat Jan  9 18:05:04 2016	(r293598)
+++ stable/10/sys/modules/linux/Makefile	Sat Jan  9 18:06:38 2016	(r293599)
@@ -62,11 +62,11 @@ linux${SFX}_support.o: linux${SFX}_assym
 
 .if ${MACHINE_CPUARCH} == "amd64"
 ${VDSO}.so: linux${SFX}_locore.o
-	${OBJCOPY} --input binary --output elf64-x86-64-freebsd			\
+	${OBJCOPY} --input-target binary --output-target elf64-x86-64-freebsd			\
 	    --binary-architecture i386 linux${SFX}_locore.o ${.TARGET}
 .else
 ${VDSO}.so: linux${SFX}_locore.o
-	${OBJCOPY} --input binary --output elf32-i386-freebsd			\
+	${OBJCOPY} --input-target binary --output-target elf32-i386-freebsd			\
 	    --binary-architecture i386 linux${SFX}_locore.o ${.TARGET}
 .endif
 

Modified: stable/10/sys/modules/linux64/Makefile
==============================================================================
--- stable/10/sys/modules/linux64/Makefile	Sat Jan  9 18:05:04 2016	(r293598)
+++ stable/10/sys/modules/linux64/Makefile	Sat Jan  9 18:06:38 2016	(r293599)
@@ -33,7 +33,7 @@ linux_locore.o: linux_locore.s linux_ass
 	    ${.IMPSRC} -o ${.TARGET}
 
 ${VDSO}.so: linux_locore.o
-	${OBJCOPY} --input binary --output elf64-x86-64-freebsd		\
+	${OBJCOPY} --input-target binary --output-target elf64-x86-64-freebsd		\
 	    -S -g --binary-architecture i386:x86-64 linux_locore.o ${.TARGET}
 
 linux_support.o: assym.s linux_assym.h