diff options
| author | dchagin <dchagin@FreeBSD.org> | 2016-01-09 18:06:38 +0000 |
|---|---|---|
| committer | dchagin <dchagin@FreeBSD.org> | 2016-01-09 18:06:38 +0000 |
| commit | 76b321901e9738ed7f461424d487da138969be2a (patch) | |
| tree | 7e0dac8ec7cf16743f71104007879250eb04107d | |
| parent | 196dc3bdfb2b5eaeb061c76c712c6443e89dc419 (diff) | |
| download | FreeBSD-src-76b321901e9738ed7f461424d487da138969be2a.zip FreeBSD-src-76b321901e9738ed7f461424d487da138969be2a.tar.gz | |
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
| -rw-r--r-- | sys/conf/files.amd64 | 2 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 2 | ||||
| -rw-r--r-- | sys/modules/linux/Makefile | 4 | ||||
| -rw-r--r-- | sys/modules/linux64/Makefile | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 01c20ae..d1e40c4 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 aca582e..af25ccf 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 d0d9562..0e70ce6 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 fe86d53..1656323 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 |
