From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Oct 2005 11:27:33 +0000 (+0000)
Subject: Only add -Wdeclaration-after-statement if the compiler supports it.
X-Git-Tag: svn/VALGRIND_3_1_0~323
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3b488400465c6cc357e51bb71bd991457685882;p=thirdparty%2Fvalgrind.git

Only add -Wdeclaration-after-statement if the compiler supports it.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4909
---

diff --git a/Makefile.core.am b/Makefile.core.am
index 257b3b0706..1859e0c59c 100644
--- a/Makefile.core.am
+++ b/Makefile.core.am
@@ -9,7 +9,7 @@ add_includes = -I$(top_srcdir)/coregrind \
 		-DVGO_$(VG_OS)=1 \
 		-DVGP_$(VG_ARCH)_$(VG_OS)=1
 
-BASE_AM_CFLAGS = @ARCH_CORE_AM_CFLAGS@ -Wmissing-prototypes -Wdeclaration-after-statement -Winline -Wall -Wshadow -O -g
+BASE_AM_CFLAGS = @ARCH_CORE_AM_CFLAGS@ -Wmissing-prototypes -Winline -Wall -Wshadow -O -g
 
 PIC_AM_CFLAGS = $(BASE_AM_CFLAGS) -fpic -fno-omit-frame-pointer
 
diff --git a/Makefile.tool-flags.am b/Makefile.tool-flags.am
index c56892f118..7e1517e2c4 100644
--- a/Makefile.tool-flags.am
+++ b/Makefile.tool-flags.am
@@ -5,6 +5,6 @@ add_includes = -I$(top_srcdir)/include \
 		-DVGP_$(VG_ARCH)_$(VG_OS)=1
 
 AM_CPPFLAGS = $(add_includes)
-AM_CFLAGS = $(WERROR) -Wmissing-prototypes -Wdeclaration-after-statement -Winline -Wall -Wshadow -O -g @ARCH_TOOL_AM_CFLAGS@
+AM_CFLAGS = $(WERROR) -Wmissing-prototypes -Winline -Wall -Wshadow -O -g @ARCH_TOOL_AM_CFLAGS@
 AM_CCASFLAGS = $(add_includes)
 
diff --git a/configure.in b/configure.in
index d7da4451dc..5faac3402c 100644
--- a/configure.in
+++ b/configure.in
@@ -418,6 +418,29 @@ if test x$no_pointer_sign = xyes; then
 fi
 
 
+# does this compiler support -Wdeclaration-after-statement ?
+AC_MSG_CHECKING([if gcc accepts -Wdeclaration-after-statement ])
+
+safe_CFLAGS=$CFLAGS
+CFLAGS="-Wdeclaration-after-statement"
+
+AC_TRY_COMPILE(, [
+int main () { return 0 ; }
+],
+[
+no_pointer_sign=yes
+AC_MSG_RESULT([yes])
+], [
+no_pointer_sign=no
+AC_MSG_RESULT([no])
+])
+CFLAGS=$safe_CFLAGS
+
+if test x$no_pointer_sign = xyes; then
+  CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+fi
+
+
 # Check for TLS support in the compiler and linker
 AC_CACHE_CHECK([for TLS support], vg_cv_tls,
 	       [AC_ARG_ENABLE(tls, [  --enable-tls            platform supports TLS],