aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Rodrigues <rodrigc@FreeBSD.org>2015-05-25 01:07:55 +0000
committerCraig Rodrigues <rodrigc@FreeBSD.org>2015-05-25 01:07:55 +0000
commitc5d87f3327cbfbaa45f292af7a232bb34bdc227d (patch)
treeccd475f61491625d81b9f7982d243db0dca23540
parent37c1967c5b0990ada472f2ee545940c49330cfbe (diff)
downloadsrc-c5d87f3327cbfbaa45f292af7a232bb34bdc227d.tar.gz
src-c5d87f3327cbfbaa45f292af7a232bb34bdc227d.zip
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
Notes
Notes: svn path=/head/; revision=283506
-rw-r--r--sys/conf/files.amd642
-rw-r--r--sys/conf/files.i3862
-rw-r--r--sys/modules/linux/Makefile4
-rw-r--r--sys/modules/linux64/Makefile2
4 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index d835be12c1bb..eae8bc66954f 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -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"
#
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 4a5d15c22316..928b10d098f0 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -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"
#
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index bbd9ff837f76..e887290260e5 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -62,11 +62,11 @@ linux${SFX}_support.o: linux${SFX}_assym.h assym.s
.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
diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile
index fe86d5313f37..165632350d42 100644
--- a/sys/modules/linux64/Makefile
+++ b/sys/modules/linux64/Makefile
@@ -33,7 +33,7 @@ linux_locore.o: linux_locore.s linux_assym.h
${.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