[Valgrind-developers] [valgrind] Remove all extra -std=c99 flags from Makefiles.

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=ea1c2293925ff462ffb812e1a8aa62b43a79d4a5

commit ea1c2293925ff462ffb812e1a8aa62b43a79d4a5
Author: Mark Wielaard <ma...@kl...>
Date:   Fri Jan 19 13:52:24 2018 +0100

    Remove all extra -std=c99 flags from Makefiles.
    
    Configure now makes sure we build everything in c99 mode already.
    No need to have extra special cases in the Makefiles.

Diff:
---
 Makefile.all.am                      | 1 -
 VEX/Makefile-gcc                     | 1 -
 drd/tests/Makefile.am                | 6 +-----
 memcheck/tests/Makefile.am           | 8 ++++----
 memcheck/tests/amd64/Makefile.am     | 3 ---
 memcheck/tests/vbit-test/Makefile.am | 4 ++--
 none/tests/Makefile.am               | 8 +-------
 none/tests/amd64/Makefile.am         | 2 +-
 none/tests/s390x/Makefile.am         | 1 -
 9 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/Makefile.all.am b/Makefile.all.am
index 29e0407..2d698cf 100644
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -98,7 +98,6 @@ clean-noinst_DSYMS:
 # that somehow causes VG_(memset) to get into infinite recursion.
 AM_CFLAGS_BASE = \
 	-O2 -finline-functions -g \
-	-std=gnu99 \
 	-Wall \
 	-Wmissing-prototypes \
 	-Wshadow \
diff --git a/VEX/Makefile-gcc b/VEX/Makefile-gcc
index eaeb8f5..0822712 100644
--- a/VEX/Makefile-gcc
+++ b/VEX/Makefile-gcc
@@ -105,7 +105,6 @@ CCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow \
 		-Wpointer-arith -Wbad-function-cast -Wcast-qual \
 		-Wcast-align -Wmissing-declarations \
 		-Wwrite-strings -Wformat -Wformat-security \
-		-std=gnu99 \
 		$(EXTRA_CFLAGS) -g -O2 -fstrict-aliasing
 
 #CC = icc
diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 9b604e9..ea058ff 100644
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -516,10 +516,6 @@ omp_matinv_CFLAGS           = $(AM_CFLAGS) -fopenmp
 omp_matinv_LDFLAGS          = -fopenmp
 omp_matinv_LDADD            = $(LDADD) -lm
 
-if VGCONF_OS_IS_SOLARIS
-omp_matinv_CFLAGS           += -std=gnu99
-endif
-
 omp_prime_CFLAGS            = $(AM_CFLAGS) -fopenmp
 omp_prime_LDFLAGS           = -fopenmp
 omp_prime_LDADD             = $(LDADD) -lm
@@ -531,7 +527,7 @@ endif
 
 matinv_CFLAGS               = $(AM_CFLAGS)
 if VGCONF_OS_IS_SOLARIS
-matinv_CFLAGS               += -std=gnu99 -D__EXTENSIONS__
+matinv_CFLAGS               += -D__EXTENSIONS__
 endif
 if HAVE_PTHREAD_BARRIER
 matinv_LDADD                = $(LDADD) -lm
diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index dbbeabf..5e6e653 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -473,7 +473,7 @@ err_disable3_LDADD 	= -lpthread
 err_disable4_LDADD 	= -lpthread
 err_disable4_CFLAGS	= $(AM_CFLAGS)
 if VGCONF_OS_IS_SOLARIS
-err_disable4_CFLAGS	+= -std=c99 -D_XOPEN_SOURCE=600
+err_disable4_CFLAGS	+= -D_XOPEN_SOURCE=600
 endif
 reach_thread_register_CFLAGS	= $(AM_CFLAGS) -O2
 reach_thread_register_LDADD	= -lpthread
@@ -501,7 +501,7 @@ manuel1_CFLAGS = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@
 
 memalign2_CFLAGS	= $(AM_CFLAGS)
 if VGCONF_OS_IS_SOLARIS
-memalign2_CFLAGS	+= -std=c99 -D__EXTENSIONS__
+memalign2_CFLAGS	+= -D__EXTENSIONS__
 endif
 
 memcmptest_CFLAGS	= $(AM_CFLAGS) -fno-builtin-memcmp
@@ -537,7 +537,7 @@ resvn_stack_CFLAGS      = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@
 
 sendmsg_CFLAGS		= $(AM_CFLAGS)
 if VGCONF_OS_IS_SOLARIS
-sendmsg_CFLAGS		+= -std=c99 -D_XOPEN_SOURCE=600
+sendmsg_CFLAGS		+= -D_XOPEN_SOURCE=600
 sendmsg_LDADD		= -lsocket -lnsl
 endif
 
@@ -591,7 +591,7 @@ else
  varinfo5so_so_LDFLAGS  = -fpic $(AM_FLAG_M3264_PRI) -shared \
 				-Wl,-soname -Wl,varinfo5so.so
 endif
-varinforestrict_CFLAGS	= $(AM_CFLAGS) -O0 -g -std=c99
+varinforestrict_CFLAGS	= $(AM_CFLAGS) -O0 -g
 
 # Build shared object for wrap7
 wrap7_SOURCES           = wrap7.c
diff --git a/memcheck/tests/amd64/Makefile.am b/memcheck/tests/amd64/Makefile.am
index 2b28dce..da15cf7 100644
--- a/memcheck/tests/amd64/Makefile.am
+++ b/memcheck/tests/amd64/Makefile.am
@@ -65,9 +65,6 @@ AM_CCASFLAGS += @FLAG_M64@
 
 fxsave_amd64_CFLAGS	= $(AM_CFLAGS) @FLAG_NO_PIE@
 insn_pcmpistri_CFLAGS	= $(AM_CFLAGS)
-if VGCONF_OS_IS_SOLARIS
-insn_pcmpistri_CFLAGS	+= --std=c99
-endif
 more_x87_fp_CFLAGS	= $(AM_CFLAGS) -O -ffast-math -mfpmath=387 \
 				-mfancy-math-387
 more_x87_fp_LDADD	= -lm
diff --git a/memcheck/tests/vbit-test/Makefile.am b/memcheck/tests/vbit-test/Makefile.am
index c2fe77f..371a71b 100644
--- a/memcheck/tests/vbit-test/Makefile.am
+++ b/memcheck/tests/vbit-test/Makefile.am
@@ -37,7 +37,7 @@ vbit_test_CPPFLAGS     = $(AM_CPPFLAGS_PRI) \
                          -I$(top_srcdir)/include  \
                          -I$(top_srcdir)/memcheck \
                          -I$(top_srcdir)/VEX/pub
-vbit_test_CFLAGS       = $(AM_CFLAGS_PRI) -std=c99
+vbit_test_CFLAGS       = $(AM_CFLAGS_PRI)
 vbit_test_DEPENDENCIES = 
 vbit_test_LDADD        = $(top_builddir)/VEX/libvex-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
-vbit_test_LDFLAGS      = $(AM_CFLAGS_PRI) -std=c99 @LIB_UBSAN@
+vbit_test_LDFLAGS      = $(AM_CFLAGS_PRI) @LIB_UBSAN@
diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 34816c0..37ac4f0 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -278,7 +278,7 @@ ansi_CFLAGS		= $(AM_CFLAGS) -ansi
 execve_CFLAGS		= $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
 if VGCONF_OS_IS_SOLARIS
 fcntl_setown_LDADD	= -lsocket -lnsl
-fdleak_cmsg_CFLAGS	= $(AM_CFLAGS) -std=c99 -D_XOPEN_SOURCE=600
+fdleak_cmsg_CFLAGS	= $(AM_CFLAGS) -D_XOPEN_SOURCE=600
 fdleak_cmsg_LDADD	= -lsocket -lnsl
 fdleak_ipv4_LDADD	= -lsocket -lnsl
 fdleak_creat_LDADD	= -lsocket -lnsl
@@ -315,9 +315,6 @@ pth_mutexspeed_LDADD	= -lpthread
 pth_once_LDADD		= -lpthread
 pth_rwlock_LDADD	= -lpthread
 pth_rwlock_CFLAGS	= $(AM_CFLAGS)
-if VGCONF_OS_IS_SOLARIS
-pth_rwlock_CFLAGS	+= --std=c99
-endif
 pth_stackalign_LDADD	= -lpthread
 pth_2sig_LDADD		= -lpthread
 pth_term_signal_LDADD	= -lpthread
@@ -337,9 +334,6 @@ thread_exits_LDADD	= -lpthread
 threaded_fork_LDADD	= -lpthread
 threadederrno_CFLAGS	= $(AM_CFLAGS)
 threadederrno_LDADD	= -lpthread
-if VGCONF_OS_IS_SOLARIS
-threadederrno_CFLAGS	+= --std=c99
-endif
 tls_SOURCES		= tls.c tls2.c
 tls_DEPENDENCIES	= tls.so tls2.so
 tls_LDFLAGS		= -Wl,-rpath,$(abs_top_builddir)/none/tests
diff --git a/none/tests/amd64/Makefile.am b/none/tests/amd64/Makefile.am
index e5a0e7e..a5e4d99 100644
--- a/none/tests/amd64/Makefile.am
+++ b/none/tests/amd64/Makefile.am
@@ -203,7 +203,7 @@ insn_fpu_SOURCES	= insn_fpu.def
 insn_fpu_LDADD		= -lm
 insn_pclmulqdq_SOURCES  = insn_pclmulqdq.def
 fxtract_LDADD		= -lm
-fma4_CFLAGS		= $(AM_CFLAGS) -std=c99
+fma4_CFLAGS             = $(AM_CFLAGS)
 if VGCONF_OS_IS_SOLARIS
 fma4_CFLAGS		+= -D__EXTENSIONS__
 endif
diff --git a/none/tests/s390x/Makefile.am b/none/tests/s390x/Makefile.am
index 781c421..fb6adbb 100644
--- a/none/tests/s390x/Makefile.am
+++ b/none/tests/s390x/Makefile.am
@@ -57,7 +57,6 @@ AM_CXXFLAGS  += @FLAG_M64@
 AM_CCASFLAGS += @FLAG_M64@
 
 allexec_CFLAGS   = $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
-tcxb_CFLAGS      = $(AM_CFLAGS) -std=gnu99
 cu12_1_CFLAGS    = $(AM_CFLAGS) -DM3=1
 cu14_1_CFLAGS    = $(AM_CFLAGS) -DM3=1
 cu21_1_CFLAGS    = $(AM_CFLAGS) -DM3=1


