19 files changed, 25 insertions, 22 deletions

diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index d9d02b98b772..393b2b925952 100644
--- a/gnu/usr.bin/binutils/Makefile.inc
+++ b/gnu/usr.bin/binutils/Makefile.inc
@@ -1,4 +1,11 @@
 #
 # $FreeBSD$
 #
+
+.if (${TARGET_ARCH} == "alpha")
+WARNS?=	2
+.else
+WARNS?=	3
+.endif
+
 .include "../Makefile.inc"
diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0
index 1d3ecaedb892..4d3d6130f2c4 100644
--- a/gnu/usr.bin/binutils/Makefile.inc0
+++ b/gnu/usr.bin/binutils/Makefile.inc0
@@ -17,11 +17,6 @@ RELTOP:= ..
 RELSRC=	${RELTOP}/../../../contrib/binutils
 SRCDIR=	${.CURDIR}/${RELSRC}
 
-.if (${TARGET_ARCH} == "alpha")
-WARNS=	2
-.else
-WARNS=	3
-.endif
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I.
 .if exists(${.CURDIR}/${TARGET_ARCH})
diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile
index 69888570e686..45fd7767ebd8 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile
+++ b/gnu/usr.bin/binutils/addr2line/Makefile
@@ -6,7 +6,7 @@
 
 PROG=	addr2line
 SRCS=	addr2line.c
-WARNS=	2
+WARNS?=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
diff --git a/gnu/usr.bin/binutils/as/Makefile.inc b/gnu/usr.bin/binutils/as/Makefile.inc
index 835b5e3c0942..1570b1524521 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc
+++ b/gnu/usr.bin/binutils/as/Makefile.inc
@@ -1,4 +1,6 @@
 # $FreeBSD$
 
+WARNS?=	2
+
 # BINDIR
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/gnu/usr.bin/binutils/as/Makefile.inc0 b/gnu/usr.bin/binutils/as/Makefile.inc0
index ccd94ab226c5..7e62e2a59465 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc0
+++ b/gnu/usr.bin/binutils/as/Makefile.inc0
@@ -15,7 +15,6 @@ SRCS+=	app.c as.c atof-generic.c atof-ieee.c bignum-copy.c \
 	subsegs.c symbols.c write.c depend.c ehopt.c
 # DEO: why not used?
 #SRCS+=	itbl-ops.c
-WARNS=	2
 CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR} -I${.CURDIR}/..
 CFLAGS+= -DVERSION=\"${VERSION:C/[ ]?${VERSION_DATE}[ ]?//g}\" 
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
diff --git a/gnu/usr.bin/binutils/as/ia64-freebsd/Makefile b/gnu/usr.bin/binutils/as/ia64-freebsd/Makefile
index c507b3a1098b..637e8cc7954f 100644
--- a/gnu/usr.bin/binutils/as/ia64-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/ia64-freebsd/Makefile
@@ -2,7 +2,7 @@
 
 .include "${.CURDIR}/../Makefile.inc0"
 
-WARNS=	0
+WARNS?=	0
 
 .if ${TARGET_ARCH} != "ia64"
 NOMAN=	 true
diff --git a/gnu/usr.bin/binutils/gasp/Makefile b/gnu/usr.bin/binutils/gasp/Makefile
index 1ea36d964a8e..237474a23830 100644
--- a/gnu/usr.bin/binutils/gasp/Makefile
+++ b/gnu/usr.bin/binutils/gasp/Makefile
@@ -6,7 +6,7 @@
 
 PROG=	gasp
 SRCS+=	gasp+%FIXED.c macro.c sb.c hash.c
-WARNS=	2
+WARNS?=	2
 CFLAGS+= -DBFD_ASSEMBLER
 CFLAGS+= -I${.CURDIR}/../as/${TARGET_ARCH}-freebsd -I${.CURDIR}/../as
 CFLAGS+= -I${.CURDIR}
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index 70434b397592..cadd3b23397d 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -50,7 +50,7 @@ SRCS=	init.c ${XSRCS} nm.h tm.h xm.h gdbversion.c xregex.h
 
 .include "${.CURDIR}/Makefile.${TARGET_ARCH}"
 
-WARNS=	0
+WARNS?=	0
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 CFLAGS+=	-DCROSS_COMPILE=1
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index c75950e1e1c6..56f652e0949e 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -10,7 +10,7 @@ SRCS+=	ldcref.c ldctor.c ldemul.c ldemul-list.h ldexp.c ldfile.c \
 	ldgram.y ldlang.c ldlex.l ldmain.c ldmisc.c \
 	ldver.c ldwrite.c lexsup.c mri.c
 
-WARNS=	1
+WARNS?=	1
 CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 3a83ca3ccb41..b05fa71cdfd5 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -10,10 +10,10 @@ SRCS+=	archive.c archive64.c archures.c bfd.c binary.c cache.c \
 	hash.c ihex.c init.c libbfd.c linker.c merge.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 config.h
+WARNS?=0
 .if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "ia64" || ${TARGET_ARCH} == "sparc64")
-WARNS=	2
+WARNS?=	2
 .endif
-WARNS=0
 CFLAGS+= -I${SRCDIR}/bfd
 CFLAGS+= -DBFD_VERSION=\"${VERSION_DATE}\" -DBFD_VERSION_DATE=${VERSION_DATE}
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index ac6a5b9ec612..8e07cc99783a 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -8,7 +8,7 @@ LIB=	binutils
 SRCS+=	arlex.l arparse.y arsup.c bucomm.c debug.c filemode.c \
 	ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \
 	wrstabs.c version.c binemul.c budemang.c emul_vanilla.c
-WARNS=	0
+WARNS?=	0
 .if ${TARGET_ARCH} == "amd64"
 BINUTILS_ARCH=x86_64
 .else
diff --git a/gnu/usr.bin/binutils/libiberty/Makefile b/gnu/usr.bin/binutils/libiberty/Makefile
index 7cce2ca98c32..cb0ac979dd36 100644
--- a/gnu/usr.bin/binutils/libiberty/Makefile
+++ b/gnu/usr.bin/binutils/libiberty/Makefile
@@ -10,7 +10,7 @@ SRCS=	argv.c choose-temp.c concat.c cp-demangle.c cplus-dem.c \
 	hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \
 	objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \
 	xstrdup.c xstrerror.c
-WARNS=	1
+WARNS?=	1
 CFLAGS+=	-DHAVE_CONFIG_H
 INTERNALLIB=	true
 
diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile
index ef2f2d68e6e9..879bcc83808c 100644
--- a/gnu/usr.bin/binutils/nm/Makefile
+++ b/gnu/usr.bin/binutils/nm/Makefile
@@ -6,7 +6,7 @@
 
 PROG=	nm
 SRCS=	nm.c
-WARNS=	2
+WARNS?=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/bfd
 CFLAGS+= -I${SRCDIR}/binutils
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile
index dfa04f520c62..f31e046df6a5 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile
+++ b/gnu/usr.bin/binutils/objcopy/Makefile
@@ -6,7 +6,7 @@
 
 PROG=	objcopy
 SRCS=	objcopy.c not-strip.c
-WARNS=	2
+WARNS?=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index 4a1d6a37de9e..fca8068638fb 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -6,7 +6,7 @@
 
 PROG=	objdump
 SRCS=	objdump.c prdbg.c
-WARNS=	2
+WARNS?=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
diff --git a/gnu/usr.bin/binutils/readelf/Makefile b/gnu/usr.bin/binutils/readelf/Makefile
index d93551c040d4..84658a5c5119 100644
--- a/gnu/usr.bin/binutils/readelf/Makefile
+++ b/gnu/usr.bin/binutils/readelf/Makefile
@@ -9,7 +9,7 @@ BINDIR=/usr/bin
 
 PROG=	readelf
 SRCS=	${PROG}.c
-WARNS=	0
+WARNS?=	0
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils -I${SRCDIR}/binutils
 
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile
index a0ef3171ed40..795fd99a9b03 100644
--- a/gnu/usr.bin/binutils/size/Makefile
+++ b/gnu/usr.bin/binutils/size/Makefile
@@ -6,7 +6,7 @@
 
 PROG=	size
 SRCS=	size.c
-WARNS=	2
+WARNS?=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile
index 346e59fcf978..0e32e100da60 100644
--- a/gnu/usr.bin/binutils/strings/Makefile
+++ b/gnu/usr.bin/binutils/strings/Makefile
@@ -6,7 +6,7 @@
 
 PROG=	strings
 SRCS=	strings.c
-WARNS=	2
+WARNS?=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile
index 45b115993ee2..594a6fef0a30 100644
--- a/gnu/usr.bin/binutils/strip/Makefile
+++ b/gnu/usr.bin/binutils/strip/Makefile
@@ -6,7 +6,7 @@
 
 PROG=	strip
 SRCS=	objcopy.c is-strip.c
-WARNS=	2
+WARNS?=	2
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 DPADD=	${RELTOP}/libbinutils/libbinutils.a