Index: head/gnu/usr.bin/binutils/Makefile.inc0
===================================================================
--- head/gnu/usr.bin/binutils/Makefile.inc0	(revision 325188)
+++ head/gnu/usr.bin/binutils/Makefile.inc0	(revision 325189)
@@ -1,52 +1,52 @@
 # $FreeBSD$
 #
 # This is included explicitly at the top of each sub-Makefile.  We can't
 # use the normal "Makefile.inc" mechanism, because we need some of these
 # definitions before the sub-Makefile is processed.
 
 VERSION=	"2.17.50 [FreeBSD] 2007-07-03"
 
 .if defined(TARGET_ARCH)
 TARGET_CPUARCH=${TARGET_ARCH:${__TO_CPUARCH}}
 .else
 TARGET_CPUARCH=${MACHINE_CPUARCH}
 .endif
 TARGET_ARCH?=	${MACHINE_ARCH}
 TARGET_VENDOR?=	unknown
 TARGET_OS?=	freebsd
 BINUTILS_ARCH=${TARGET_ARCH:C/amd64/x86_64/}
 TARGET_TUPLE?=	${BINUTILS_ARCH}-${TARGET_VENDOR}-${TARGET_OS}
 .if ${TARGET_ARCH:Marm*eb} != "" || \
 	(${TARGET_CPUARCH} == "mips" && ${TARGET_ARCH:Mmips*el*} == "")
 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" || \
 	${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpcspe" || \
 	(${TARGET_CPUARCH} == "mips" && ${TARGET_ARCH:Mmips64*} == "")
 CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32
 .else
 CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64
 .endif
 
 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}
 
 .if exists(${.CURDIR}/Makefile.${TARGET_ARCH})
 .include "${.CURDIR}/Makefile.${TARGET_ARCH}"
 .elif exists(${.CURDIR}/Makefile.${TARGET_CPUARCH})
 .include "${.CURDIR}/Makefile.${TARGET_CPUARCH}"
 .endif
Index: head/gnu/usr.bin/binutils/as/Makefile
===================================================================
--- head/gnu/usr.bin/binutils/as/Makefile	(revision 325188)
+++ head/gnu/usr.bin/binutils/as/Makefile	(revision 325189)
@@ -1,103 +1,103 @@
 # $FreeBSD$
 
 
 # BINDIR
 .include "${.CURDIR}/../../Makefile.inc"
 .include "${.CURDIR}/../Makefile.inc0"
 .include <src.opts.mk>
 
 .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
 
 .if ${TARGET_ARCH:Marm*} || ${TARGET_ARCH} == "powerpc64"
 NO_WERROR.clang=
 .endif
 
 PROG=	as
 SRCS+=	app.c \
 	as.c \
 	atof-generic.c \
 	atof-ieee.c \
 	cond.c \
 	depend.c \
 	dw2gencfi.c \
 	dwarf2dbg.c \
 	ecoff.c \
 	ehopt.c \
 	expr.c \
 	flonum-copy.c \
 	flonum-konst.c \
 	flonum-mult.c \
 	frags.c \
 	hash.c \
 	input-file.c \
 	input-scrub.c \
 	listing.c \
 	literal.c \
 	macro.c \
 	messages.c \
 	obj-elf.c \
 	output-file.c \
 	read.c \
 	sb.c \
 	stabs.c \
 	subsegs.c \
 	symbols.c \
 	write.c
 # DEO: why not used?
 #SRCS+=	itbl-ops.c
 
 .if ${TARGET_ARCH:Marmv6*} != ""
 CFLAGS+=	-DCPU_DEFAULT=ARM_ARCH_V6K
 .endif
 .if ${TARGET_ARCH:Marmv7*} != ""
 CFLAGS+=	-DCPU_DEFAULT=ARM_ARCH_V7A
 .endif
 
 .if ${TARGET_CPUARCH} == "mips"
 SRCS+=	itbl-ops.c itbl-parse.y itbl-lex.l
 .if ${TARGET_ARCH:Mmips64*} != ""
 CFLAGS+=	-DMIPS_DEFAULT_ABI=N64_ABI -DMIPS_DEFAULT_64BIT=1
 .elif ${TARGET_ARCH:Mmipsn32*} != ""
 CFLAGS+=	-DMIPS_DEFAULT_ABI=N32_ABI
 .else
 MIPS_ABI_DEFAULT=ABI_32
 .endif
 .endif
 
 .if ${TARGET_ARCH} == "amd64"
 SRCS+=	tc-i386.c
 .elif ${TARGET_CPUARCH} == "powerpc"
 SRCS+=	tc-ppc.c
 .elif ${TARGET_ARCH} == "sparc64"
 SRCS+=	tc-sparc.c
 .else
 SRCS+=	tc-${TARGET_CPUARCH}.c
 .endif
 
 .if ${TARGET_ARCH} == "sparc64"
 CFLAGS+= -DDEFAULT_ARCH=\"v9-64\"
 .else
 CFLAGS+= -DDEFAULT_ARCH=\"${BINUTILS_ARCH}\"
 .endif
 .if defined(TARGET_BIG_ENDIAN)
 CFLAGS+= -DTARGET_BYTES_BIG_ENDIAN=1
 .endif
 CFLAGS+= -DTARGET_CPU=\"${BINUTILS_ARCH}\"
 CFLAGS+= -DTARGET_OS=\"${TARGET_OS}\"
 CFLAGS+= -DTARGET_CANONICAL=\"${TARGET_TUPLE}\"
 CFLAGS+= -DTARGET_ALIAS=\"${TARGET_TUPLE}\"
 CFLAGS+= -DVERSION=\"${VERSION}\"
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/bfd -I${SRCDIR}/gas/config -I${SRCDIR}
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_CPUARCH}-freebsd
 
 .if ${MK_SHARED_TOOLCHAIN} == "no"
 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 <bsd.prog.mk>
Index: head/gnu/usr.bin/binutils/ld/Makefile
===================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile	(revision 325188)
+++ head/gnu/usr.bin/binutils/ld/Makefile	(revision 325189)
@@ -1,79 +1,79 @@
 # $FreeBSD$
 
 ELF_SCR_EXT=	x xbn xc xd xdc xdw xn xr xs xsc xsw xu xw
 .include "../Makefile.inc0"
 .include <src.opts.mk>
 
 .PATH: ${SRCDIR}/ld
 
 PROG=	ld.bfd
 MAN=	ld.1
 SCRIPTDIR= /usr/libdata/ldscripts
 SRCS+=	ldcref.c \
 	ldctor.c \
 	ldemul-list.h \
 	ldemul.c \
 	ldexp.c \
 	ldfile.c \
 	ldgram.y \
 	ldlang.c \
 	ldlex.l \
 	ldmain.c \
 	ldmisc.c \
 	ldver.c \
 	ldwrite.c \
 	lexsup.c \
 	mri.c
 
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -DBINDIR=\"${BINDIR}\"
 .if defined(TOOLS_PREFIX)
 CFLAGS+= -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX}\"
 .else
 CFLAGS+= -DTARGET_SYSTEM_ROOT=\"/\"
 .endif
 CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}/${BINDIR}/libexec\"
 CFLAGS+= -D_GNU_SOURCE
 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
 
 FILES=		${LDSCRIPTS:S|^|ldscripts/|}
 FILESDIR=	${SCRIPTDIR}
 .if ${MK_LLD_IS_LD} == "no"
 LINKS=		${BINDIR}/ld.bfd ${BINDIR}/ld
 .endif
 
 HOST=		${TARGET_TUPLE}
 LIBSEARCHPATH=	\"=/lib\":\"=/usr/lib\"
 .for ext in ${ELF_SCR_EXT}
 LDSCRIPTS+=	${NATIVE_EMULATION}.${ext}
 ldscripts/${NATIVE_EMULATION}.${ext}: e${NATIVE_EMULATION}.c
 .endfor
 
 EMXFR=
 EMLST=
 .for _e in ${NATIVE_EMULATION} ${EMS}
 EMXFR+=	extern ld_emulation_xfer_type ld_${_e}_emulation;
 EMLST+=	&ld_${_e}_emulation,
 .endfor
 
 ldemul-list.h:
 	echo "${EMXFR}" > ${.TARGET}
 	echo "#define EMULATION_LIST ${EMLST} 0" >> ${.TARGET}
 
 stringify.sed: ${SRCDIR}/ld/emultempl/astring.sed .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 GENDIRDEPS_FILTER.host+= Nusr.bin/yacc
 
 .include <bsd.prog.mk>
Index: head/gnu/usr.bin/binutils/objcopy/Makefile
===================================================================
--- head/gnu/usr.bin/binutils/objcopy/Makefile	(revision 325188)
+++ head/gnu/usr.bin/binutils/objcopy/Makefile	(revision 325189)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
 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 <bsd.prog.mk>
Index: head/gnu/usr.bin/binutils/objdump/Makefile
===================================================================
--- head/gnu/usr.bin/binutils/objdump/Makefile	(revision 325188)
+++ head/gnu/usr.bin/binutils/objdump/Makefile	(revision 325189)
@@ -1,19 +1,19 @@
 # $FreeBSD$
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/binutils ${SRCDIR}/binutils/doc
 
 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 <bsd.prog.mk>