From e083002bcac10c4257d937b7b5f44360136962a4 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 22 Oct 2010 20:46:08 +0000
Subject: [PATCH] Most of binutils now compiles at WARNS=3, except for
 libiberty and libbfd, which still need WARNS=2.

---
 gnu/usr.bin/binutils/addr2line/Makefile   | 1 -
 gnu/usr.bin/binutils/as/Makefile          | 2 --
 gnu/usr.bin/binutils/ld/Makefile          | 1 -
 gnu/usr.bin/binutils/libbfd/Makefile      | 1 -
 gnu/usr.bin/binutils/libbinutils/Makefile | 1 -
 gnu/usr.bin/binutils/libiberty/Makefile   | 2 +-
 gnu/usr.bin/binutils/nm/Makefile          | 1 -
 gnu/usr.bin/binutils/objcopy/Makefile     | 1 -
 gnu/usr.bin/binutils/objdump/Makefile     | 1 -
 gnu/usr.bin/binutils/readelf/Makefile     | 1 -
 gnu/usr.bin/binutils/size/Makefile        | 1 -
 gnu/usr.bin/binutils/strings/Makefile     | 1 -
 gnu/usr.bin/binutils/strip/Makefile       | 1 -
 13 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile
index 958afa65d7b0..2380738fa638 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile
+++ b/gnu/usr.bin/binutils/addr2line/Makefile
@@ -6,7 +6,6 @@
 
 PROG=	addr2line
 SRCS=	addr2line.c
-WARNS?=	2
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index 917e0f02b3a9..1469214d1f7e 100644
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -3,8 +3,6 @@
 
 # BINDIR
 .include "${.CURDIR}/../../Makefile.inc"
-WARNS?=	2
-NO_WERROR=
 .include "${.CURDIR}/../Makefile.inc0"
 
 .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 77c5d2d949e6..80467b832545 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -26,7 +26,6 @@ SRCS+=	ldcref.c \
 	lexsup.c \
 	mri.c
 
-WARNS?=	0	# ldemul.h problem (`struct option' declared inside parameter list)
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\"
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index fe3b966d1114..d475e977030c 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -41,7 +41,6 @@ SRCS+=	archive.c \
 	targets.c \
 	targmatch.h \
 	tekhex.c
-WARNS?=	0
 .if (${TARGET_ARCH} == "ia64" || ${TARGET_ARCH} == "sparc64")
 WARNS?=	2
 .endif
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index 3901defb5b6c..5cda054f78d0 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -23,7 +23,6 @@ SRCS+=	arlex.l \
 	unwind-ia64.c \
 	version.c \
 	wrstabs.c
-WARNS?=	0
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -D_GNU_SOURCE
diff --git a/gnu/usr.bin/binutils/libiberty/Makefile b/gnu/usr.bin/binutils/libiberty/Makefile
index 3f77ffd72416..56e5259f93f1 100644
--- a/gnu/usr.bin/binutils/libiberty/Makefile
+++ b/gnu/usr.bin/binutils/libiberty/Makefile
@@ -34,7 +34,7 @@ SRCS=	argv.c \
 # The following files are needed by gdb(1)
 SRCS+=	splay-tree.c
 
-WARNS?=	1
+WARNS?=	2
 CFLAGS+=	-DHAVE_CONFIG_H
 INTERNALLIB=
 
diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile
index 4da4bb2d0423..4ef2b8fdf65a 100644
--- a/gnu/usr.bin/binutils/nm/Makefile
+++ b/gnu/usr.bin/binutils/nm/Makefile
@@ -6,7 +6,6 @@
 
 PROG=	nm
 SRCS=	nm.c
-WARNS?=	2
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/bfd
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile
index 977e1d86aece..66d99f4e7538 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile
+++ b/gnu/usr.bin/binutils/objcopy/Makefile
@@ -6,7 +6,6 @@
 
 PROG=	objcopy
 SRCS=	objcopy.c not-strip.c
-WARNS?=	2
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index 7b4b81d966eb..1a0d04625d1a 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -6,7 +6,6 @@
 
 PROG=	objdump
 SRCS=	objdump.c prdbg.c
-WARNS?=	1
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
diff --git a/gnu/usr.bin/binutils/readelf/Makefile b/gnu/usr.bin/binutils/readelf/Makefile
index 8a50e06304e0..d90c3bcc9cc9 100644
--- a/gnu/usr.bin/binutils/readelf/Makefile
+++ b/gnu/usr.bin/binutils/readelf/Makefile
@@ -9,7 +9,6 @@ BINDIR=/usr/bin
 
 PROG=	readelf
 SRCS=	${PROG}.c
-WARNS?=	0
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils -I${SRCDIR}/binutils
 
diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile
index dc1f896fb7e6..c5c19c1908e9 100644
--- a/gnu/usr.bin/binutils/size/Makefile
+++ b/gnu/usr.bin/binutils/size/Makefile
@@ -6,7 +6,6 @@
 
 PROG=	size
 SRCS=	size.c
-WARNS?=	2
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile
index 0f80db4a4a8b..a432d51ddf65 100644
--- a/gnu/usr.bin/binutils/strings/Makefile
+++ b/gnu/usr.bin/binutils/strings/Makefile
@@ -6,7 +6,6 @@
 
 PROG=	strings
 SRCS=	strings.c
-WARNS?=	2
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile
index a3ed45aeafe0..d3cf8c454cdc 100644
--- a/gnu/usr.bin/binutils/strip/Makefile
+++ b/gnu/usr.bin/binutils/strip/Makefile
@@ -6,7 +6,6 @@
 
 PROG=	strip
 SRCS=	objcopy.c is-strip.c
-WARNS?=	2
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils -I${SRCDIR}/bfd