summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/binutils
diff options
context:
space:
mode:
authortv <tv@NetBSD.org>2001-08-06 20:00:02 +0000
committertv <tv@NetBSD.org>2001-08-06 20:00:02 +0000
commit3db6f60ffe6cfe68fd8d2b1f36cd48f4d0a3d4c2 (patch)
treec0bd56960431682bdcfd26c3e84e1d9ff200457a /gnu/usr.bin/binutils
parent923efdf6000abc5a542ce26fbad229b994320853 (diff)
Use target_alias without a release number; toolchain2netbsd strips this now.
Diffstat (limited to 'gnu/usr.bin/binutils')
-rw-r--r--gnu/usr.bin/binutils/ld/Makefile10
-rw-r--r--gnu/usr.bin/binutils/ld/arch/i386/config.h2
-rw-r--r--gnu/usr.bin/binutils/ld/arch/i386/defs.mk5
-rw-r--r--gnu/usr.bin/binutils/ld/arch/i386/ldemul-list.h2
4 files changed, 9 insertions, 10 deletions
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 767a7133743..f5acc43124a 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/08/06 19:34:22 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/08/06 20:00:02 tv Exp $
TOP= ${.CURDIR}/../../..
DIST= ${TOP}/dist/toolchain
@@ -6,14 +6,12 @@ DIST= ${TOP}/dist/toolchain
.include <bsd.own.mk>
.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
-TARGET= ${G_target_alias:C/[\.0-9]*$//}
-
PROG= ld
SRCS= ${G_OFILES:.o=.c}
CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} \
-DDEFAULT_EMULATION=\"${G_EMUL}\" \
-DSCRIPTDIR=\"/usr/share\" \
- -DTARGET=\"${TARGET}\"
+ -DTARGET=\"${G_target_alias}\"
LDADD= -lintl
DPADD= ${LIBINTL}
@@ -26,7 +24,7 @@ IBERTYOBJ!= cd ${TOP}/lib/libiberty && ${PRINTOBJDIR}
LDADD+= -L${IBERTYOBJ} -liberty
DPADD+= ${IBERTYOBJ}/libiberty.a
-TEXINFO= ld.texinfo
+TEXINFO= ${G_TEXINFOS}
INFOFLAGS= -I${DIST}/ld -I${DIST}/bfd/doc
FILESDIR= /usr/share/ldscripts
@@ -50,7 +48,7 @@ CLEANFILES+= .depend.${f} e${f}.c
e${f}.c: ${DIST}/ld/genscripts.sh stringify.sed
LIB_PATH=/usr/lib sh ${DIST}/ld/genscripts.sh ${DIST}/ld ${LIBDIR} /usr \
- none ${TARGET} ${TARGET} ${G_EMUL} ${LIBDIR} ${f}
+ none ${G_target_alias} ${G_target_alias} ${G_EMUL} ${LIBDIR} ${f}
FILES+= ${f}.x ${f}.xbn ${f}.xn ${f}.xr ${f}.xu
diff --git a/gnu/usr.bin/binutils/ld/arch/i386/config.h b/gnu/usr.bin/binutils/ld/arch/i386/config.h
index dcdafc0334b..0cf9f0a0c41 100644
--- a/gnu/usr.bin/binutils/ld/arch/i386/config.h
+++ b/gnu/usr.bin/binutils/ld/arch/i386/config.h
@@ -1,5 +1,5 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: toolchain2netbsd,v 1.4 2001/08/06 15:31:23 tv Exp */
+/* Generated from: NetBSD: toolchain2netbsd,v 1.6 2001/08/06 19:58:25 tv Exp */
/* config.h. Generated automatically by configure. */
/* config.in. Generated automatically from configure.in by autoheader. */
diff --git a/gnu/usr.bin/binutils/ld/arch/i386/defs.mk b/gnu/usr.bin/binutils/ld/arch/i386/defs.mk
index a493ace95fe..4ec2ee96dee 100644
--- a/gnu/usr.bin/binutils/ld/arch/i386/defs.mk
+++ b/gnu/usr.bin/binutils/ld/arch/i386/defs.mk
@@ -1,5 +1,5 @@
# This file is automatically generated. DO NOT EDIT!
-# Generated from: NetBSD: toolchain2netbsd,v 1.4 2001/08/06 15:31:23 tv Exp
+# Generated from: NetBSD: toolchain2netbsd,v 1.6 2001/08/06 19:58:25 tv Exp
#
G_DEFS=-DHAVE_CONFIG_H -I. -I${DIST}/ld -I.
G_EMUL=elf_i386
@@ -7,4 +7,5 @@ G_EMULATION_OFILES=eelf_i386.o ei386nbsd.o
G_INCLUDES=-D_GNU_SOURCE -I. -I${DIST}/ld -I../bfd -I${DIST}/ld/../bfd -I${DIST}/ld/../include -I${DIST}/ld/../intl -I../intl -g -O2 -DLOCALEDIR="\"/usr/local/share/locale\""
G_OFILES=ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o ldwrite.o ldexp.o ldemul.o ldver.o ldmisc.o ldfile.o ldcref.o eelf_i386.o ei386nbsd.o
G_STRINGIFY=astring.sed
-G_target_alias=i386-unknown-netbsdelf1.5.1
+G_TEXINFOS=ld.texinfo
+G_target_alias=i386-unknown-netbsdelf
diff --git a/gnu/usr.bin/binutils/ld/arch/i386/ldemul-list.h b/gnu/usr.bin/binutils/ld/arch/i386/ldemul-list.h
index a0cc160508e..f959d2b1397 100644
--- a/gnu/usr.bin/binutils/ld/arch/i386/ldemul-list.h
+++ b/gnu/usr.bin/binutils/ld/arch/i386/ldemul-list.h
@@ -1,5 +1,5 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: toolchain2netbsd,v 1.4 2001/08/06 15:31:23 tv Exp */
+/* Generated from: NetBSD: toolchain2netbsd,v 1.6 2001/08/06 19:58:25 tv Exp */
/* This file is automatically generated. DO NOT EDIT! */
extern ld_emulation_xfer_type ld_elf_i386_emulation;