summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2012-04-04 10:59:44 +0000
committerjoerg <joerg@NetBSD.org>2012-04-04 10:59:44 +0000
commit231b1fc79cda3a038f9b4cd83642966b14daf5cb (patch)
tree0ec5157c3bd0af494b96d70426bd24422c272e4e /regress
parent13f62ddb211cd9e972d4464557777d01e3b6734b (diff)
Disable new -Wstring-plus-int warning where needed for now.
Adjust various places that add GCC-only options to check for the active compiler first.
Diffstat (limited to 'regress')
-rw-r--r--regress/sys/kern/ras/ras1/Makefile8
-rw-r--r--regress/sys/kern/ras/ras2/Makefile8
-rw-r--r--regress/sys/kern/ras/ras3/Makefile8
3 files changed, 9 insertions, 15 deletions
diff --git a/regress/sys/kern/ras/ras1/Makefile b/regress/sys/kern/ras/ras1/Makefile
index ddb111adcc9..a0928f5b486 100644
--- a/regress/sys/kern/ras/ras1/Makefile
+++ b/regress/sys/kern/ras/ras1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
NOMAN= #defined
@@ -12,9 +12,7 @@ regress:
echo "FAILED"; \
fi
-.include <bsd.prog.mk>
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-reorder-blocks :}
-.if defined(HAVE_GCC)
-CFLAGS+= -fno-reorder-blocks
-.endif
+.include <bsd.prog.mk>
diff --git a/regress/sys/kern/ras/ras2/Makefile b/regress/sys/kern/ras/ras2/Makefile
index 48ccea27682..da8d825c994 100644
--- a/regress/sys/kern/ras/ras2/Makefile
+++ b/regress/sys/kern/ras/ras2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
NOMAN= #defined
@@ -12,8 +12,6 @@ regress:
echo "FAILED"; \
fi
-.include <bsd.prog.mk>
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-reorder-blocks :}
-.if defined(HAVE_GCC)
-CFLAGS+= -fno-reorder-blocks
-.endif
+.include <bsd.prog.mk>
diff --git a/regress/sys/kern/ras/ras3/Makefile b/regress/sys/kern/ras/ras3/Makefile
index f74158e3233..1e5dd9809b5 100644
--- a/regress/sys/kern/ras/ras3/Makefile
+++ b/regress/sys/kern/ras/ras3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/06/20 07:43:59 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/04 10:59:47 joerg Exp $
NOMAN= #defined
PROG= ras3
@@ -11,8 +11,6 @@ regress:
echo "FAILED"; \
fi
-.include <bsd.prog.mk>
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -fno-reorder-blocks :}
-.if defined(HAVE_GCC)
-CFLAGS+= -fno-reorder-blocks
-.endif
+.include <bsd.prog.mk>