From owner-svn-src-all@FreeBSD.ORG Mon May 25 01:07:57 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7848053C; Mon, 25 May 2015 01:07:57 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6597E269; Mon, 25 May 2015 01:07:57 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4P17vkb061680; Mon, 25 May 2015 01:07:57 GMT (envelope-from rodrigc@FreeBSD.org) Received: (from rodrigc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4P17uNs061671; Mon, 25 May 2015 01:07:56 GMT (envelope-from rodrigc@FreeBSD.org) Message-Id: <201505250107.t4P17uNs061671@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigc set sender to rodrigc@FreeBSD.org using -f From: Craig Rodrigues Date: Mon, 25 May 2015 01:07:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r283506 - in head/sys: conf modules/linux modules/linux64 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2015 01:07:57 -0000 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