7 files changed, 4 insertions, 14 deletions

diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 0b22a984e01b..4ad77a9913a4 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -35,6 +35,7 @@ CFLAGS+= -DSELECT_ARCHITECTURES="${SELARCH}"
 
 SELVEC=
 .for _v in ${VECS}
+CFLAGS+= -DHAVE_${_v}
 .if ${SELVEC} == ""
 SELVEC+= &${_v}
 .else
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index 4922e2d45d10..08b18082d6a1 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
@@ -6,8 +6,7 @@ VECS+=	bfd_elf64_alpha_freebsd_vec ecoffalpha_little_vec
 .if ${TARGET_ARCH} == "alpha"
 CFLAGS+= -DDEFAULT_VECTOR=bfd_elf64_alpha_freebsd_vec
 .endif
-CFLAGS+= -DHAVE_bfd_elf64_alpha_freebsd_vec
-CFLAGS+= -DHAVE_ecoffalpha_little_vec
+
 CLEANFILES+=	elf64-target.h
 
 elf64-target.h: elfxx-target.h
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
index f61aac1ab076..8eb7405a6f86 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -5,12 +5,10 @@ VECS+=	bfd_elf32_i386_freebsd_vec
 .if ${TARGET_ARCH} == "i386"
 CFLAGS+= -DDEFAULT_VECTOR=bfd_elf32_i386_freebsd_vec
 .endif
-CFLAGS+= -DHAVE_bfd_elf32_i386_freebsd_vec
 
 .if	defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
 SRCS+=	pe-i386.c pei-i386.c
 VECS+=	i386pe_vec i386pei_vec
-CFLAGS+= -DHAVE_i386pe_vec -DHAVE_i386pei_vec
 .endif
 
 CLEANFILES+=	elf32-target.h
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.ia64 b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
index 0a08943cf105..7ca5d3c5c385 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.ia64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
@@ -12,10 +12,6 @@ VECS+=	bfd_efi_app_ia64_vec \
 .if ${TARGET_ARCH} == "ia64"
 CFLAGS+= -DDEFAULT_VECTOR=bfd_elf64_ia64_little_vec
 .endif
-CFLAGS+= -DHAVE_bfd_elf64_ia64_little_vec -DHAVE_bfd_elf64_ia64_big_vec \
-	 -DHAVE_bfd_efi_app_ia64_vec \
-	 -DHAVE_bfd_elf64_little_generic_vec -DHAVE_bfd_elf64_big_generic_vec \
-	 -DHAVE_bfd_elf32_little_generic_vec -DHAVE_bfd_elf32_big_generic_vec
 
 GENSRCS= elf32-target.h elf64-target.h elf64-ia64.c pepigen.c # peigen.c
 SRCS+=	${GENSRCS}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
index 282cd5ad16ee..f766a0fc02ea 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
@@ -17,9 +17,7 @@ VECS+=	bfd_elf32_powerpc_vec	\
 .if ${TARGET_ARCH} == "powerpc"
 CFLAGS+= -DDEFAULT_VECTOR=bfd_elf32_powerpc_vec
 .endif
-CFLAGS+= -DHAVE_bfd_elf32_powerpc_vec	\
-	-DHAVE_bfd_elf32_powerpcle_vec	\
-	-DHAVE_ppcboot_vec
+
 CLEANFILES+=	elf32-target.h
 
 elf32-target.h: elfxx-target.h
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64 b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
index a5a3d2b5a191..84918bae9e92 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
@@ -16,8 +16,7 @@ VECS+=	bfd_elf32_sparc_vec bfd_elf64_sparc_vec sparcnetbsd_vec sunos_big_vec
 .if ${TARGET_ARCH} == "sparc64"
 CFLAGS+= -DDEFAULT_VECTOR=bfd_elf64_sparc_vec
 .endif
-CFLAGS+= -DHAVE_bfd_elf32_sparc_vec -DHAVE_bfd_elf64_sparc_vec \
-	 -DHAVE_sparcnetbsd_vec -DHAVE_sunos_big_vec
+
 CLEANFILES+=	elf32-target.h elf64-target.h
 
 elf32-target.h:	elfxx-target.h
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.x86-64 b/gnu/usr.bin/binutils/libbfd/Makefile.x86-64
index 70f281171a56..42e333d90e91 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.x86-64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.x86-64
@@ -4,7 +4,6 @@ SRCS+=	cpu-i386.c elf64-x86-64.c elf64-target.h elf64-gen.c elf64.c \
 	elf32-i386.c elf32-target.h elf32.c efi-app-ia32.c elf32-gen.c elflink.c
 VECS+=	bfd_elf64_x86_64_vec bfd_elf32_i386_vec
 CFLAGS+= -DDEFAULT_VECTOR=bfd_elf64_x86_64_vec
-CFLAGS+= -DHAVE_bfd_elf64_x86_64_vec -DHAVE_bfd_elf32_i386_vec -DHAVE_bfd_efi_app_ia32_vec -DHAVE_bfd_elf64_little_generic_vec -DHAVE_bfd_elf64_big_generic_vec -DHAVE_bfd_elf32_little_generic_vec -DHAVE_bfd_elf32_big_generic_vec
 
 CLEANFILES+=	elf64-target.h elf32-target.h