From owner-svn-src-all@freebsd.org Tue Oct 31 00:07:39 2017 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 6D265E2FFA2; Tue, 31 Oct 2017 00:07:39 +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 45C317CB65; Tue, 31 Oct 2017 00:07:39 +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 v9V07c2S047527; Tue, 31 Oct 2017 00:07:38 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V07bKA047522; Tue, 31 Oct 2017 00:07:37 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201710310007.v9V07bKA047522@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 31 Oct 2017 00:07:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325189 - in head/gnu/usr.bin/binutils: . as ld objcopy objdump X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: in head/gnu/usr.bin/binutils: . as ld objcopy objdump X-SVN-Commit-Revision: 325189 X-SVN-Commit-Repository: base 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.23 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, 31 Oct 2017 00:07:39 -0000 Author: bdrewery Date: Tue Oct 31 00:07:37 2017 New Revision: 325189 URL: https://svnweb.freebsd.org/changeset/base/325189 Log: Rename RELTOP since it will mean something else globally. Sponsored by: Dell EMC Isilon Modified: head/gnu/usr.bin/binutils/Makefile.inc0 head/gnu/usr.bin/binutils/as/Makefile head/gnu/usr.bin/binutils/ld/Makefile head/gnu/usr.bin/binutils/objcopy/Makefile head/gnu/usr.bin/binutils/objdump/Makefile Modified: head/gnu/usr.bin/binutils/Makefile.inc0 ============================================================================== --- head/gnu/usr.bin/binutils/Makefile.inc0 Tue Oct 31 00:07:04 2017 (r325188) +++ head/gnu/usr.bin/binutils/Makefile.inc0 Tue Oct 31 00:07:37 2017 (r325189) @@ -21,12 +21,12 @@ TARGET_TUPLE?= ${BINUTILS_ARCH}-${TARGET_VENDOR}-${TAR TARGET_BIG_ENDIAN=t .endif -# RELTOP is the relative path to this point in the source or object +# GNURELTOP is the relative path to this point in the source or object # tree, from any subdirectory of same. It gets extra "../" prefixes # added to it as we descend into subdirectories. -RELTOP:= .. +GNURELTOP:= .. -RELSRC= ${RELTOP}/../../../contrib/binutils +RELSRC= ${GNURELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} .if ${TARGET_CPUARCH} == "arm" || ${TARGET_CPUARCH} == "i386" || \ @@ -39,8 +39,8 @@ CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 CFLAGS+= -I. CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd -CFLAGS+= -I${.OBJDIR}/${RELTOP}/libbfd +CFLAGS+= -I${.CURDIR}/${GNURELTOP}/libbfd +CFLAGS+= -I${.OBJDIR}/${GNURELTOP}/libbfd CFLAGS+= -I${SRCDIR}/include ARCHS= ${TARGET_CPUARCH} Modified: head/gnu/usr.bin/binutils/as/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/as/Makefile Tue Oct 31 00:07:04 2017 (r325188) +++ head/gnu/usr.bin/binutils/as/Makefile Tue Oct 31 00:07:37 2017 (r325189) @@ -95,9 +95,9 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_CPUARCH}-f NO_SHARED?= yes .endif -DPADD= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a -DPADD+= ${RELTOP}/libopcodes/libopcodes.a +DPADD= ${GNURELTOP}/libbfd/libbfd.a +DPADD+= ${GNURELTOP}/libiberty/libiberty.a +DPADD+= ${GNURELTOP}/libopcodes/libopcodes.a LDADD= ${DPADD} .include Modified: head/gnu/usr.bin/binutils/ld/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/ld/Makefile Tue Oct 31 00:07:04 2017 (r325188) +++ head/gnu/usr.bin/binutils/ld/Makefile Tue Oct 31 00:07:37 2017 (r325189) @@ -41,8 +41,8 @@ CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd .if ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= yes .endif -DPADD= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD= ${GNURELTOP}/libbfd/libbfd.a +DPADD+= ${GNURELTOP}/libiberty/libiberty.a LDADD= ${DPADD} CLEANDIRS+= ldscripts CLEANFILES+= ldemul-list.h stringify.sed Modified: head/gnu/usr.bin/binutils/objcopy/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/objcopy/Makefile Tue Oct 31 00:07:04 2017 (r325188) +++ head/gnu/usr.bin/binutils/objcopy/Makefile Tue Oct 31 00:07:37 2017 (r325189) @@ -7,11 +7,11 @@ PROG= objcopy SRCS= objcopy.c not-strip.c CFLAGS+= -D_GNU_SOURCE -CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils +CFLAGS+= -I${.CURDIR}/${GNURELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD= ${GNURELTOP}/libbinutils/libbinutils.a +DPADD+= ${GNURELTOP}/libbfd/libbfd.a +DPADD+= ${GNURELTOP}/libiberty/libiberty.a LDADD= ${DPADD} .include Modified: head/gnu/usr.bin/binutils/objdump/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/objdump/Makefile Tue Oct 31 00:07:04 2017 (r325188) +++ head/gnu/usr.bin/binutils/objdump/Makefile Tue Oct 31 00:07:37 2017 (r325189) @@ -7,13 +7,13 @@ PROG= objdump SRCS= objdump.c prdbg.c CFLAGS+= -D_GNU_SOURCE -CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils +CFLAGS+= -I${.CURDIR}/${GNURELTOP}/libbinutils CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" -DPADD= ${RELTOP}/libbinutils/libbinutils.a -DPADD+= ${RELTOP}/libopcodes/libopcodes.a -DPADD+= ${RELTOP}/libbfd/libbfd.a -DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD= ${GNURELTOP}/libbinutils/libbinutils.a +DPADD+= ${GNURELTOP}/libopcodes/libopcodes.a +DPADD+= ${GNURELTOP}/libbfd/libbfd.a +DPADD+= ${GNURELTOP}/libiberty/libiberty.a LDADD= ${DPADD} .include