Author: rodrigc
Date: Mon May 25 01:07:55 2015
New Revision: 283506
URL: https://svnweb.freebsd.org/changeset/base/283506
Log:
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
Reported by: Jenkins
Modified:
head/sys/conf/files.amd64
head/sys/conf/files.i386
head/sys/modules/linux/Makefile
head/sys/modules/linux64/Makefile
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Mon May 25 01:06:55 2015 (r283505)
+++ head/sys/conf/files.amd64 Mon May 25 01:07:55 2015 (r283506)
@@ -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: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Mon May 25 01:06:55 2015 (r283505)
+++ head/sys/conf/files.i386 Mon May 25 01:07:55 2015 (r283506)
@@ -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: head/sys/modules/linux/Makefile
==============================================================================
--- head/sys/modules/linux/Makefile Mon May 25 01:06:55 2015
(r283505)
+++ head/sys/modules/linux/Makefile Mon May 25 01:07:55 2015
(r283506)
@@ -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: head/sys/modules/linux64/Makefile
==============================================================================
--- head/sys/modules/linux64/Makefile Mon May 25 01:06:55 2015
(r283505)
+++ head/sys/modules/linux64/Makefile Mon May 25 01:07:55 2015
(r283506)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
