Adapt more places where binutils-2.17 has changed the format of the

linker warning massages.

14 files changed, 19 insertions, 19 deletions

diff --git a/regress/gnu/egcs/gcc-bounds/Makefile b/regress/gnu/egcs/gcc-bounds/Makefile
index 817ce23ad20..9075da9ecc2 100644
--- a/regress/gnu/egcs/gcc-bounds/Makefile
+++ b/regress/gnu/egcs/gcc-bounds/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2016/09/24 01:01:38 bluhm Exp $
+# $OpenBSD: Makefile,v 1.16 2016/09/25 21:35:12 bluhm Exp $
 
 C_MODULES?=	strlcpy strlcat getcwd memcpy fread memcpy declare \
 		sscanf vararray md builtins
@@ -36,16 +36,16 @@ c-${i}-${j}:
 .  for j in ${CPP_${i:U}}
 CPP_TARGETS+= cpp-${i}-${j}
 cpp-${i}-${j}:
-	${TCXX} ${TCXXFLAGS} -o /dev/null ${i}-${j}.cpp 2>&1 | grep -v 'misused' | sed '/^\/tmp\//d' | diff -u - ${.CURDIR}/${i}-${j}.cpp${EXP}
+	${TCXX} ${TCXXFLAGS} -o /dev/null ${i}-${j}.cpp 2>&1 | grep -v 'misused' | sed '/^\/tmp\//d;s/(\.text+0x[0-9a-f]*)//' | diff -u - ${.CURDIR}/${i}-${j}.cpp${EXP}
 .  endfor
 .endfor
 
 generate:
 .for i in ${C_TARGETS}
-	-${TCC} ${TCFLAGS} -o /dev/null ${i:C/^c-//g}.c 2>&1 | sed '/^\/tmp\//d' >${i:C/^c-//g}.c${EXP}
+	-${TCC} ${TCFLAGS} -o /dev/null ${i:C/^c-//g}.c 2>&1 | sed '/^\/tmp\//d;s/(\.text+0x[0-9a-f]*)//' >${i:C/^c-//g}.c${EXP}
 .endfor
 .for i in ${CPP_TARGETS}
-	-${TCXX} ${TCXXFLAGS} -o /dev/null ${i:C/^cpp-//g}.cpp 2>&1 | sed '/^\/tmp\//d' >${i:C/^cpp-//g}.cpp${EXP}
+	-${TCXX} ${TCXXFLAGS} -o /dev/null ${i:C/^cpp-//g}.cpp 2>&1 | sed '/^\/tmp\//d;s/(\.text+0x[0-9a-f]*)//' >${i:C/^cpp-//g}.cpp${EXP}
 .endfor
 
 .PHONY:	${REGRESS_TARGETS} generate regress
diff --git a/regress/gnu/egcs/gcc-builtins/Makefile b/regress/gnu/egcs/gcc-builtins/Makefile
index 97fce163ee9..4d216affd8c 100644
--- a/regress/gnu/egcs/gcc-builtins/Makefile
+++ b/regress/gnu/egcs/gcc-builtins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2013/12/28 03:19:02 martynas Exp $
+# $OpenBSD: Makefile,v 1.3 2016/09/25 21:35:12 bluhm Exp $
 
 GCC_BUILTINS=	sprintf-1 sprintf-2 sprintf-3 stpcpy-1 stpcpy-2 strcat-1 \
 		strcat-2 strcpy-1 strcpy-2 strncat-1 vsprintf-1 vsprintf-2 \
@@ -11,12 +11,12 @@ TCXXFLAGS=	${TCFLAGS}
 .for i in ${GCC_BUILTINS}
 REGRESS_TARGETS+= c-${i}
 c-${i}:
-	${TCC} ${TCFLAGS} -o /dev/null ${i}.c 2>&1 | sed '/^\/tmp\//d' | diff -u - ${.CURDIR}/${i}.c.exp
+	${TCC} ${TCFLAGS} -o /dev/null ${i}.c 2>&1 | sed '/^\/tmp\//d;s/(\.text+0x[0-9a-f]*)//' | diff -u - ${.CURDIR}/${i}.c.exp
 .endfor
 
 generate:
 .for i in ${REGRESS_TARGETS}
-	-${TCC} ${TCFLAGS} -o /dev/null ${i:C/^c-//g}.c 2>&1 | sed '/^\/tmp\//d' >${i:C/^c-//g}.c.exp
+	-${TCC} ${TCFLAGS} -o /dev/null ${i:C/^c-//g}.c 2>&1 | sed '/^\/tmp\//d;s/(\.text+0x[0-9a-f]*)//' >${i:C/^c-//g}.c.exp
 .endfor
 
 .PHONY:	${REGRESS_TARGETS} generate regress
diff --git a/regress/gnu/egcs/gcc-builtins/sprintf-1.c.exp b/regress/gnu/egcs/gcc-builtins/sprintf-1.c.exp
index 833d1855cd3..ea0ab54a770 100644
--- a/regress/gnu/egcs/gcc-builtins/sprintf-1.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/sprintf-1.c.exp
@@ -1 +1 @@
-: warning: sprintf() is often misused, please use snprintf()
+sprintf-1.c:: warning: warning: sprintf() is often misused, please use snprintf()
diff --git a/regress/gnu/egcs/gcc-builtins/sprintf-2.c.exp b/regress/gnu/egcs/gcc-builtins/sprintf-2.c.exp
index 833d1855cd3..926c241d7a5 100644
--- a/regress/gnu/egcs/gcc-builtins/sprintf-2.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/sprintf-2.c.exp
@@ -1 +1 @@
-: warning: sprintf() is often misused, please use snprintf()
+sprintf-2.c:: warning: warning: sprintf() is often misused, please use snprintf()
diff --git a/regress/gnu/egcs/gcc-builtins/sprintf-3.c.exp b/regress/gnu/egcs/gcc-builtins/sprintf-3.c.exp
index 833d1855cd3..c7b95203492 100644
--- a/regress/gnu/egcs/gcc-builtins/sprintf-3.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/sprintf-3.c.exp
@@ -1 +1 @@
-: warning: sprintf() is often misused, please use snprintf()
+sprintf-3.c:: warning: warning: sprintf() is often misused, please use snprintf()
diff --git a/regress/gnu/egcs/gcc-builtins/stpcpy-1.c.exp b/regress/gnu/egcs/gcc-builtins/stpcpy-1.c.exp
index 71ccf1c76da..f3aa83b0c50 100644
--- a/regress/gnu/egcs/gcc-builtins/stpcpy-1.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/stpcpy-1.c.exp
@@ -1 +1 @@
-: warning: stpcpy() is dangerous; do not use it
+stpcpy-1.c:: warning: warning: stpcpy() is dangerous; do not use it
diff --git a/regress/gnu/egcs/gcc-builtins/stpcpy-2.c.exp b/regress/gnu/egcs/gcc-builtins/stpcpy-2.c.exp
index 71ccf1c76da..a2d9617e8cf 100644
--- a/regress/gnu/egcs/gcc-builtins/stpcpy-2.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/stpcpy-2.c.exp
@@ -1 +1 @@
-: warning: stpcpy() is dangerous; do not use it
+stpcpy-2.c:: warning: warning: stpcpy() is dangerous; do not use it
diff --git a/regress/gnu/egcs/gcc-builtins/strcat-1.c.exp b/regress/gnu/egcs/gcc-builtins/strcat-1.c.exp
index 4e102acab4c..0af3c3d6e84 100644
--- a/regress/gnu/egcs/gcc-builtins/strcat-1.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/strcat-1.c.exp
@@ -1 +1 @@
-: warning: strcat() is almost always misused, please use strlcat()
+strcat-1.c:: warning: warning: strcat() is almost always misused, please use strlcat()
diff --git a/regress/gnu/egcs/gcc-builtins/strcat-2.c.exp b/regress/gnu/egcs/gcc-builtins/strcat-2.c.exp
index 4e102acab4c..8879b67df2a 100644
--- a/regress/gnu/egcs/gcc-builtins/strcat-2.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/strcat-2.c.exp
@@ -1 +1 @@
-: warning: strcat() is almost always misused, please use strlcat()
+strcat-2.c:: warning: warning: strcat() is almost always misused, please use strlcat()
diff --git a/regress/gnu/egcs/gcc-builtins/strcpy-1.c.exp b/regress/gnu/egcs/gcc-builtins/strcpy-1.c.exp
index 5af91ab605a..03b6dee6af7 100644
--- a/regress/gnu/egcs/gcc-builtins/strcpy-1.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/strcpy-1.c.exp
@@ -1 +1 @@
-: warning: strcpy() is almost always misused, please use strlcpy()
+strcpy-1.c:: warning: warning: strcpy() is almost always misused, please use strlcpy()
diff --git a/regress/gnu/egcs/gcc-builtins/strcpy-2.c.exp b/regress/gnu/egcs/gcc-builtins/strcpy-2.c.exp
index 5af91ab605a..e2429b1e43e 100644
--- a/regress/gnu/egcs/gcc-builtins/strcpy-2.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/strcpy-2.c.exp
@@ -1 +1 @@
-: warning: strcpy() is almost always misused, please use strlcpy()
+strcpy-2.c:: warning: warning: strcpy() is almost always misused, please use strlcpy()
diff --git a/regress/gnu/egcs/gcc-builtins/vsprintf-1.c.exp b/regress/gnu/egcs/gcc-builtins/vsprintf-1.c.exp
index cdac4efb0fe..3e4d5267e26 100644
--- a/regress/gnu/egcs/gcc-builtins/vsprintf-1.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/vsprintf-1.c.exp
@@ -1 +1 @@
-: warning: vsprintf() is often misused, please use vsnprintf()
+vsprintf-1.c:: warning: warning: vsprintf() is often misused, please use vsnprintf()
diff --git a/regress/gnu/egcs/gcc-builtins/vsprintf-2.c.exp b/regress/gnu/egcs/gcc-builtins/vsprintf-2.c.exp
index cdac4efb0fe..a1f77cdf668 100644
--- a/regress/gnu/egcs/gcc-builtins/vsprintf-2.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/vsprintf-2.c.exp
@@ -1 +1 @@
-: warning: vsprintf() is often misused, please use vsnprintf()
+vsprintf-2.c:: warning: warning: vsprintf() is often misused, please use vsnprintf()
diff --git a/regress/gnu/egcs/gcc-builtins/vsprintf-3.c.exp b/regress/gnu/egcs/gcc-builtins/vsprintf-3.c.exp
index cdac4efb0fe..334ce4e1f9a 100644
--- a/regress/gnu/egcs/gcc-builtins/vsprintf-3.c.exp
+++ b/regress/gnu/egcs/gcc-builtins/vsprintf-3.c.exp
@@ -1 +1 @@
-: warning: vsprintf() is often misused, please use vsnprintf()
+vsprintf-3.c:: warning: warning: vsprintf() is often misused, please use vsnprintf()