8 files changed, 144 insertions, 153 deletions

diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index aa6f9403a41f..824b75731a78 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -1,19 +1,17 @@
-#
 # $FreeBSD$
-#
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/bfd ${SRCDIR}/opcodes
 
-LIB=		bfd
-SRCS+=		archive.c archures.c bfd.c binary.c cache.c \
-		coffgen.c corefile.c elf.c format.c hash.c ihex.c \
-		init.c libbfd.c linker.c opncls.c reloc.c section.c \
-		srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \
-		targmatch.h dwarf1.c dwarf2.c
-CFLAGS+=	-I${SRCDIR}/bfd
-CFLAGS+=	-DBFD_VERSION=\"${VERSION}\"
+LIB=	bfd
+SRCS+=	archive.c archures.c bfd.c binary.c cache.c \
+	coffgen.c corefile.c elf.c format.c hash.c ihex.c \
+	init.c libbfd.c linker.c opncls.c reloc.c section.c \
+	srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \
+	targmatch.h dwarf1.c dwarf2.c
+CFLAGS+= -I${SRCDIR}/bfd
+CFLAGS+= -DBFD_VERSION=\"${VERSION}\"
 NOPROFILE=	true
 NOPIC=		true
 INTERNALLIB=	true
@@ -23,35 +21,35 @@ CLEANFILES+=	targmatch.h
 # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU
 # binutils release. FreeBSD only distributes the bits that are required to
 # build native architectures. BINUTILSDISTDIR is needed to build cross tools.
-.if	defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
-.PATH:		${BINUTILSDISTDIR}/bfd ${BINUTILSDISTDIR}/opcodes
-CFLAGS+=	-I${BINUTILSDISTDIR}/bfd
-CFLAGS+=	-I${BINUTILSDISTDIR}/include
+.if defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
+.PATH: ${BINUTILSDISTDIR}/bfd ${BINUTILSDISTDIR}/opcodes
+CFLAGS+= -I${BINUTILSDISTDIR}/bfd
+CFLAGS+= -I${BINUTILSDISTDIR}/include
 .endif
 
 SELARCH=
 .if ${BINUTIL_ARCH} == "sparc64"
-SELARCH=&bfd_sparc_arch
+SELARCH= &bfd_sparc_arch
 .else
 .for _a in ${ARCHS}
 .if ${SELARCH} == ""
-SELARCH+=&bfd_${_a}_arch
+SELARCH+= &bfd_${_a}_arch
 .else
-SELARCH+=,&bfd_${_a}_arch
+SELARCH+= ,&bfd_${_a}_arch
 .endif
 .endfor
 .endif
-CFLAGS+=	-DSELECT_ARCHITECTURES="${SELARCH}"
+CFLAGS+= -DSELECT_ARCHITECTURES="${SELARCH}"
 
 SELVEC=
 .for _v in ${VECS}
 .if ${SELVEC} == ""
-SELVEC+=&${_v}
+SELVEC+= &${_v}
 .else
-SELVEC+=,&${_v}
+SELVEC+= ,&${_v}
 .endif
 .endfor
-CFLAGS+=	-DSELECT_VECS="${SELVEC}"
+CFLAGS+= -DSELECT_VECS="${SELVEC}"
 
 targmatch.h: targmatch.sed config.bfd
 	sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index c26229260e79..e8649109ab03 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
@@ -1,15 +1,13 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		coff-alpha.c cpu-alpha.c ecoff.c ecofflink.c elf64-alpha.c \
-		elf64-target.h elf64.c elflink.c
-VECS+=		bfd_elf64_alpha_vec ecoffalpha_little_vec
+SRCS+=	coff-alpha.c cpu-alpha.c ecoff.c ecofflink.c elf64-alpha.c \
+	elf64-target.h elf64.c elflink.c
+VECS+=	bfd_elf64_alpha_vec ecoffalpha_little_vec
 .if ${TARGET_ARCH} == "alpha"
-CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf64_alpha_vec
+CFLAGS+= -DDEFAULT_VECTOR=bfd_elf64_alpha_vec
 .endif
-CFLAGS+=	-DHAVE_bfd_elf64_alpha_vec
-CFLAGS+=	-DHAVE_ecoffalpha_little_vec
+CFLAGS+= -DHAVE_bfd_elf64_alpha_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 b777cf4fe1a4..03c15c1d384f 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -1,17 +1,16 @@
-#
 # $FreeBSD$
-#
-SRCS+=		cpu-i386.c elf32-i386.c elf32-target.h elf32.c elflink.c
-VECS+=		bfd_elf32_i386_vec
+
+SRCS+=	cpu-i386.c elf32-i386.c elf32-target.h elf32.c elflink.c
+VECS+=	bfd_elf32_i386_vec
 .if ${TARGET_ARCH} == "i386"
-CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_i386_vec
+CFLAGS+= -DDEFAULT_VECTOR=bfd_elf32_i386_vec
 .endif
-CFLAGS+=	-DHAVE_bfd_elf32_i386_vec
+CFLAGS+= -DHAVE_bfd_elf32_i386_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
+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.m68k b/gnu/usr.bin/binutils/libbfd/Makefile.m68k
index 99937a440c45..747d6a0b6d15 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.m68k
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.m68k
@@ -1,49 +1,49 @@
-#
 # $FreeBSD$
-#
-SRCS+=		aout32.c	\
-		cf-m68klynx.c	\
-		coff-aux.c	\
-		coff-m68k.c	\
-		coff-svm68k.c	\
-		coff-u68k.c	\
-		cofflink.c	\
-		cpu-m68k.c	\
-		elf32-m68k.c	\
-		elf32-target.h	\
-		elf32.c		\
-		elflink.c	\
-		lynx-core.c	\
-		m68k4knetbsd.c	\
-		m68klinux.c	\
-		m68klynx.c	\
-		m68knetbsd.c	\
-		sunos.c
-VECS+=		bfd_elf32_m68k_vec	\
-		m68k4knetbsd_vec	\
-		m68kaux_coff_vec	\
-		m68kcoff_vec		\
-		m68kcoffun_vec		\
-		m68klinux_vec		\
-		m68klynx_aout_vec	\
-		m68klynx_coff_vec	\
-		m68knetbsd_vec		\
-		m68ksysvcoff_vec	\
-		sunos_big_vec
+
+SRCS+=	aout32.c	\
+	cf-m68klynx.c	\
+	coff-aux.c	\
+	coff-m68k.c	\
+	coff-svm68k.c	\
+	coff-u68k.c	\
+	cofflink.c	\
+	cpu-m68k.c	\
+	elf32-m68k.c	\
+	elf32-target.h	\
+	elf32.c		\
+	elflink.c	\
+	lynx-core.c	\
+	m68k4knetbsd.c	\
+	m68klinux.c	\
+	m68klynx.c	\
+	m68knetbsd.c	\
+	sunos.c
+VECS+=	bfd_elf32_m68k_vec	\
+	m68k4knetbsd_vec	\
+	m68kaux_coff_vec	\
+	m68kcoff_vec		\
+	m68kcoffun_vec		\
+	m68klinux_vec		\
+	m68klynx_aout_vec	\
+	m68klynx_coff_vec	\
+	m68knetbsd_vec		\
+	m68ksysvcoff_vec	\
+	sunos_big_vec
+
 .if ${TARGET_ARCH} == "m68k"
-CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_m68k_vec
+CFLAGS+= -DDEFAULT_VECTOR=bfd_elf32_m68k_vec
 .endif
-CFLAGS+=	-DHAVE_bfd_elf32_m68k_vec
-CFLAGS+=	-DHAVE_m68k4knetbsd_vec
-CFLAGS+=	-DHAVE_m68kaux_coff_vec
-CFLAGS+=	-DHAVE_m68kcoff_vec
-CFLAGS+=	-DHAVE_m68kcoffun_vec
-CFLAGS+=	-DHAVE_m68klinux_vec
-CFLAGS+=	-DHAVE_m68klynx_aout_vec
-CFLAGS+=	-DHAVE_m68klynx_coff_vec
-CFLAGS+=	-DHAVE_m68knetbsd_vec
-CFLAGS+=	-DHAVE_m68ksysvcoff_vec
-CFLAGS+=	-DHAVE_sunos_big_vec
+CFLAGS+= -DHAVE_bfd_elf32_m68k_vec
+CFLAGS+= -DHAVE_m68k4knetbsd_vec
+CFLAGS+= -DHAVE_m68kaux_coff_vec
+CFLAGS+= -DHAVE_m68kcoff_vec
+CFLAGS+= -DHAVE_m68kcoffun_vec
+CFLAGS+= -DHAVE_m68klinux_vec
+CFLAGS+= -DHAVE_m68klynx_aout_vec
+CFLAGS+= -DHAVE_m68klynx_coff_vec
+CFLAGS+= -DHAVE_m68knetbsd_vec
+CFLAGS+= -DHAVE_m68ksysvcoff_vec
+CFLAGS+= -DHAVE_sunos_big_vec
 CLEANFILES+=	elf32-target.h
 
 elf32-target.h:	elfxx-target.h
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
index bc02946c697b..9e16c55528d1 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.powerpc
@@ -1,34 +1,33 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		cofflink.c	\
-		cpu-powerpc.c	\
-		elf32-ppc.c	\
-		elf32-target.h	\
-		elf32.c		\
-		elflink.c	\
-		pe-ppc.c	\
-		pei-ppc.c	\
-		ppcboot.c	\
-		xcofflink.c
-VECS+=		bfd_elf32_powerpc_vec	\
-		bfd_elf32_powerpcle_vec	\
-		bfd_powerpc_pe_vec	\
-		bfd_powerpc_pei_vec	\
-		bfd_powerpcle_pe_vec	\
-		bfd_powerpcle_pei_vec	\
-		ppcboot_vec
+SRCS+=	cofflink.c	\
+	cpu-powerpc.c	\
+	elf32-ppc.c	\
+	elf32-target.h	\
+	elf32.c		\
+	elflink.c	\
+	pe-ppc.c	\
+	pei-ppc.c	\
+	ppcboot.c	\
+	xcofflink.c
+VECS+=	bfd_elf32_powerpc_vec	\
+	bfd_elf32_powerpcle_vec	\
+	bfd_powerpc_pe_vec	\
+	bfd_powerpc_pei_vec	\
+	bfd_powerpcle_pe_vec	\
+	bfd_powerpcle_pei_vec	\
+	ppcboot_vec
+
 .if ${TARGET_ARCH} == "powerpc"
-CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_powerpc_vec
+CFLAGS+= -DDEFAULT_VECTOR=bfd_elf32_powerpc_vec
 .endif
-CFLAGS+=	-DHAVE_bfd_elf32_powerpc_vec	\
-		-DHAVE_bfd_elf32_powerpcle_vec	\
-		-DHAVE_bfd_powerpc_pe_vec	\
-		-DHAVE_bfd_powerpc_pei_vec	\
-		-DHAVE_bfd_powerpcle_pe_vec	\
-		-DHAVE_bfd_powerpcle_pei_vec	\
-		-DHAVE_ppcboot_vec
+CFLAGS+= -DHAVE_bfd_elf32_powerpc_vec	\
+	-DHAVE_bfd_elf32_powerpcle_vec	\
+	-DHAVE_bfd_powerpc_pe_vec	\
+	-DHAVE_bfd_powerpc_pei_vec	\
+	-DHAVE_bfd_powerpcle_pe_vec	\
+	-DHAVE_bfd_powerpcle_pei_vec	\
+	-DHAVE_ppcboot_vec
 CLEANFILES+=	elf32-target.h
 
 elf32-target.h: elfxx-target.h
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.rs6000 b/gnu/usr.bin/binutils/libbfd/Makefile.rs6000
index daf3f653b2a3..b1a3babf8553 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.rs6000
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.rs6000
@@ -1,13 +1,12 @@
-#
 # $FreeBSD$
-#
 
-SRCS+=		coff-rs6000.c	\
-		cofflink.c	\
-		cpu-rs6000.c	\
-		xcofflink.c
-VECS+=		rs6000coff_vec
+SRCS+=	coff-rs6000.c	\
+	cofflink.c	\
+	cpu-rs6000.c	\
+	xcofflink.c
+VECS+=	rs6000coff_vec
+
 .if ${TARGET_ARCH} == "rs6000"
-CFLAGS+=	-DDEFAULT_VECTOR=rs6000coff_vec
+CFLAGS+= -DDEFAULT_VECTOR=rs6000coff_vec
 .endif
-CFLAGS+=	-DHAVE_rs6000coff_vec
+CFLAGS+= -DHAVE_rs6000coff_vec
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.sparc b/gnu/usr.bin/binutils/libbfd/Makefile.sparc
index 7be5390a1443..7ebd6deadc34 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.sparc
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.sparc
@@ -1,24 +1,23 @@
-#
 # $FreeBSD$
-#
-SRCS+=		aout32.c	\
-		cpu-sparc.c	\
-		elf32-sparc.c	\
-		elf32-target.h	\
-		elf32.c		\
-		elf64-sparc.c	\
-		elf64-target.h	\
-		elf64.c		\
-		elflink.c	\
-		sparcnetbsd.c	\
-		sunos.c
-VECS+=		bfd_elf32_sparc_vec bfd_elf64_sparc_vec sparcnetbsd_vec \
-		sunos_big_vec
+
+SRCS+=	aout32.c	\
+	cpu-sparc.c	\
+	elf32-sparc.c	\
+	elf32-target.h	\
+	elf32.c		\
+	elf64-sparc.c	\
+	elf64-target.h	\
+	elf64.c		\
+	elflink.c	\
+	sparcnetbsd.c	\
+	sunos.c
+VECS+=	bfd_elf32_sparc_vec bfd_elf64_sparc_vec sparcnetbsd_vec sunos_big_vec
+
 .if ${TARGET_ARCH} == "sparc"
-CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_sparc_vec
+CFLAGS+= -DDEFAULT_VECTOR=bfd_elf32_sparc_vec
 .endif
-CFLAGS+=	-DHAVE_bfd_elf32_sparc_vec -DHAVE_bfd_elf64_sparc_vec \
-		-DHAVE_sparcnetbsd_vec -DHAVE_sunos_big_vec
+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.sparc64 b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
index 42f9fdf868f0..a5a3d2b5a191 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.sparc64
@@ -1,24 +1,23 @@
-#
 # $FreeBSD$
-#
-SRCS+=		aout32.c	\
-		cpu-sparc.c	\
-		elf32-sparc.c	\
-		elf32-target.h	\
-		elf32.c		\
-		elf64-sparc.c	\
-		elf64-target.h	\
-		elf64.c		\
-		elflink.c	\
-		sparcnetbsd.c	\
-		sunos.c
-VECS+=		bfd_elf32_sparc_vec bfd_elf64_sparc_vec sparcnetbsd_vec \
-		sunos_big_vec
+
+SRCS+=	aout32.c	\
+	cpu-sparc.c	\
+	elf32-sparc.c	\
+	elf32-target.h	\
+	elf32.c		\
+	elf64-sparc.c	\
+	elf64-target.h	\
+	elf64.c		\
+	elflink.c	\
+	sparcnetbsd.c	\
+	sunos.c
+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
+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
+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