From b782c9f5b6c05a4c5856e0e194772e61ef42eaf6 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Mon, 2 Dec 2002 09:59:05 +0000
Subject: [PATCH] Cleaner support of a DEFAULT_VECTOR.

---
 gnu/usr.bin/binutils/libbfd/Makefile.alpha   | 7 ++++---
 gnu/usr.bin/binutils/libbfd/Makefile.i386    | 8 ++++----
 gnu/usr.bin/binutils/libbfd/Makefile.ia64    | 9 +++++----
 gnu/usr.bin/binutils/libbfd/Makefile.powerpc | 7 ++++---
 gnu/usr.bin/binutils/libbfd/Makefile.sparc64 | 7 ++++---
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index 08b18082d6a1..5754cbc901db 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
@@ -1,13 +1,14 @@
 # $FreeBSD$
 
+DEFAULT_VECTOR=	bfd_elf64_alpha_freebsd_vec
+
 SRCS+=	coff-alpha.c cpu-alpha.c ecoff.c ecofflink.c elf64-alpha-fbsd.c \
 	elf64-target.h elf64.c elflink.c
-VECS+=	bfd_elf64_alpha_freebsd_vec ecoffalpha_little_vec
+VECS=	${DEFAULT_VECTOR} ecoffalpha_little_vec
 .if ${TARGET_ARCH} == "alpha"
-CFLAGS+= -DDEFAULT_VECTOR=bfd_elf64_alpha_freebsd_vec
+CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR}
 .endif
 
 CLEANFILES+=	elf64-target.h
-
 elf64-target.h: elfxx-target.h
 	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
index 8eb7405a6f86..14700ec97d35 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -1,10 +1,11 @@
 # $FreeBSD$
 
+DEFAULT_VECTOR=	bfd_elf32_i386_freebsd_vec
+
 SRCS+=	cpu-i386.c elf32-i386-fbsd.c elf32-target.h elf32.c elflink.c
-VECS+=	bfd_elf32_i386_freebsd_vec
+VECS=	${DEFAULT_VECTOR}
 .if ${TARGET_ARCH} == "i386"
-CFLAGS+= -DDEFAULT_VECTOR=bfd_elf32_i386_freebsd_vec
-.endif
+CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR}
 
 .if	defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
 SRCS+=	pe-i386.c pei-i386.c
@@ -12,6 +13,5 @@ VECS+=	i386pe_vec i386pei_vec
 .endif
 
 CLEANFILES+=	elf32-target.h
-
 elf32-target.h:	elfxx-target.h
 	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.ia64 b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
index 7ca5d3c5c385..69d6b1919d12 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.ia64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
@@ -1,16 +1,18 @@
 # $FreeBSD$
 
+DEFAULT_VECTOR=	bfd_elf64_ia64_little_vec
+
 SRCS+=	cofflink.c cpu-ia64.c efi-app-ia64.c elf32.c elf32-gen.c elf64.c \
 	elf64-gen.c elf64-ia64.c elflink.c
 #SRCS+=	coff-ia64.c elf32-ia64.c
 
-VECS+=	bfd_efi_app_ia64_vec \
-	bfd_elf64_ia64_little_vec bfd_elf64_ia64_big_vec \
+VECS+=	${DEFAULT_VECTOR} \
+	bfd_elf64_ia64_big_vec \
 	bfd_elf64_little_generic_vec bfd_elf64_big_generic_vec \
 	bfd_elf32_little_generic_vec bfd_elf32_big_generic_vec
 
 .if ${TARGET_ARCH} == "ia64"
-CFLAGS+= -DDEFAULT_VECTOR=bfd_elf64_ia64_little_vec
+CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR}
 .endif
 
 GENSRCS= elf32-target.h elf64-target.h elf64-ia64.c pepigen.c # peigen.c
@@ -23,7 +25,6 @@ elf32-target.h: elfxx-target.h
 elf64-target.h: elfxx-target.h
 	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
 
-
 elf64-ia64.c: elfxx-ia64.c
 	sed -e s/NN/64/g -e 's/^.*#.*define.*ELF_DYNAMIC_INTERPRETER.*$$//g' \
 	    ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
index f766a0fc02ea..df0c57fc36fd 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+DEFAULT_VECTOR=	bfd_elf32_powerpc_vec
+
 SRCS+=	\
 	cpu-powerpc.c	\
 	cpu-rs6000.c	\
@@ -10,15 +12,14 @@ SRCS+=	\
 	elflink.c	\
 	ppcboot.c	\
 	#xcofflink.c
-VECS+=	bfd_elf32_powerpc_vec	\
+VECS+=	${DEFAULT_VECTOR} \
 	bfd_elf32_powerpcle_vec	\
 	ppcboot_vec
 
 .if ${TARGET_ARCH} == "powerpc"
-CFLAGS+= -DDEFAULT_VECTOR=bfd_elf32_powerpc_vec
+CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR}
 .endif
 
 CLEANFILES+=	elf32-target.h
-
 elf32-target.h: elfxx-target.h
 	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64 b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
index 84918bae9e92..a10a08120a95 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+DEFAULT_VECTOR=	bfd_elf64_sparc_vec
+
 SRCS+=	aout32.c	\
 	cpu-sparc.c	\
 	elf32-sparc.c	\
@@ -11,14 +13,13 @@ SRCS+=	aout32.c	\
 	elflink.c	\
 	sparcnetbsd.c	\
 	sunos.c
-VECS+=	bfd_elf32_sparc_vec bfd_elf64_sparc_vec sparcnetbsd_vec sunos_big_vec
+VECS=	${DEFAULT_VECTOR} bfd_elf32_sparc_vec sparcnetbsd_vec sunos_big_vec
 
 .if ${TARGET_ARCH} == "sparc64"
-CFLAGS+= -DDEFAULT_VECTOR=bfd_elf64_sparc_vec
+CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR}
 .endif
 
 CLEANFILES+=	elf32-target.h elf64-target.h
-
 elf32-target.h:	elfxx-target.h
 	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}