From owner-svn-src-all@freebsd.org Tue Oct 13 18:34:24 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09D94A12A70; Tue, 13 Oct 2015 18:34:24 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 D4F011C97; Tue, 13 Oct 2015 18:34:23 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9DIYMQJ021871; Tue, 13 Oct 2015 18:34:22 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9DIYMeR021866; Tue, 13 Oct 2015 18:34:22 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201510131834.t9DIYMeR021866@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 13 Oct 2015 18:34:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r289243 - stable/9/gnu/usr.bin/binutils/ld X-SVN-Group: stable-9 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: Tue, 13 Oct 2015 18:34:24 -0000 Author: bdrewery Date: Tue Oct 13 18:34:22 2015 New Revision: 289243 URL: https://svnweb.freebsd.org/changeset/base/289243 Log: MFC r288230,r288233: r288230: Fix emulation ldscripts not being installed since r131832. r288233: Fix subdir -j build after r287983 by adding missing dependencies. Modified: stable/9/gnu/usr.bin/binutils/ld/Makefile stable/9/gnu/usr.bin/binutils/ld/Makefile.amd64 stable/9/gnu/usr.bin/binutils/ld/Makefile.mips stable/9/gnu/usr.bin/binutils/ld/Makefile.powerpc64 stable/9/gnu/usr.bin/binutils/ld/Makefile.sparc64 Directory Properties: stable/9/gnu/usr.bin/binutils/ (props changed) Modified: stable/9/gnu/usr.bin/binutils/ld/Makefile ============================================================================== --- stable/9/gnu/usr.bin/binutils/ld/Makefile Tue Oct 13 18:32:47 2015 (r289242) +++ stable/9/gnu/usr.bin/binutils/ld/Makefile Tue Oct 13 18:34:22 2015 (r289243) @@ -1,5 +1,6 @@ # $FreeBSD$ +ELF_SCR_EXT= x xbn xc xd xdc xdw xn xr xs xsc xsw xu xw .include "../Makefile.inc0" .include @@ -46,9 +47,9 @@ CLEANFILES+= ldemul-list.h stringify.sed HOST= ${TARGET_TUPLE} LIBSEARCHPATH= \"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\" -ELF_SCR_EXT= x xbn xc xd xdc xdw xn xr xs xsc xsw xu xw .for ext in ${ELF_SCR_EXT} LDSCRIPTS+= ${NATIVE_EMULATION}.${ext} +ldscripts/${NATIVE_EMULATION}.${ext}: e${NATIVE_EMULATION}.c .endfor EMXFR= Modified: stable/9/gnu/usr.bin/binutils/ld/Makefile.amd64 ============================================================================== --- stable/9/gnu/usr.bin/binutils/ld/Makefile.amd64 Tue Oct 13 18:32:47 2015 (r289242) +++ stable/9/gnu/usr.bin/binutils/ld/Makefile.amd64 Tue Oct 13 18:34:22 2015 (r289243) @@ -16,6 +16,7 @@ _i386_path= \"${TOOLS_PREFIX}/usr/lib32\ EMS+= ${X86_EMULATION} .for ext in ${ELF_SCR_EXT} LDSCRIPTS+= ${X86_EMULATION}.${ext} +ldscripts/${X86_EMULATION}.${ext}: e${X86_EMULATION}.c .endfor SRCS+= e${X86_EMULATION}.c Modified: stable/9/gnu/usr.bin/binutils/ld/Makefile.mips ============================================================================== --- stable/9/gnu/usr.bin/binutils/ld/Makefile.mips Tue Oct 13 18:32:47 2015 (r289242) +++ stable/9/gnu/usr.bin/binutils/ld/Makefile.mips Tue Oct 13 18:34:22 2015 (r289243) @@ -22,6 +22,7 @@ EMS+= ${abi} #.endif .for ext in ${ELF_SCR_EXT} LDSCRIPTS+= ${abi}.${ext} +ldscripts/${abi}.${ext}: e${abi}.c .endfor SRCS+= e${abi}.c CLEANFILES+= e${abi}.c Modified: stable/9/gnu/usr.bin/binutils/ld/Makefile.powerpc64 ============================================================================== --- stable/9/gnu/usr.bin/binutils/ld/Makefile.powerpc64 Tue Oct 13 18:32:47 2015 (r289242) +++ stable/9/gnu/usr.bin/binutils/ld/Makefile.powerpc64 Tue Oct 13 18:34:22 2015 (r289243) @@ -16,6 +16,7 @@ _ppc32_path= \"${TOOLS_PREFIX}/usr/lib32 EMS+= ${PPC32_EMULATION} .for ext in ${ELF_SCR_EXT} LDSCRIPTS+= ${PPC32_EMULATION}.${ext} +ldscripts/${PPC32_EMULATION}.${ext}: e${PPC32_EMULATION}.c .endfor SRCS+= e${PPC32_EMULATION}.c Modified: stable/9/gnu/usr.bin/binutils/ld/Makefile.sparc64 ============================================================================== --- stable/9/gnu/usr.bin/binutils/ld/Makefile.sparc64 Tue Oct 13 18:32:47 2015 (r289242) +++ stable/9/gnu/usr.bin/binutils/ld/Makefile.sparc64 Tue Oct 13 18:34:22 2015 (r289243) @@ -17,6 +17,7 @@ e${NATIVE_EMULATION}.c: emulparams/${NAT EMS+= elf${BITS}_sparc .for ext in ${ELF_SCR_EXT} LDSCRIPTS+= elf${BITS}_sparc.${ext} +ldscripts/elf${BITS}_sparc.${ext}: eelf${BITS}_sparc.c .endfor SRCS+= eelf${BITS}_sparc.c