Revert "configure: Leverage gcc warn options to enable safe use of C99 features where...

This reverts commit 79daa510c7a871a33797308a2ccb4b83a067ffbe.

I apparently hadn't done a clean build when testing this; it broke the
build for Tom, Ben, and myself.  We like the idea; let's try a v2.

diff --git a/configure.ac b/configure.ac
index 22dc023..5fbb7bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -263,18 +263,6 @@ if test "x$GCC" = xyes; then
     # gcc's builtin memcmp is slower than glibc's
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43052
     CFLAGS="$CFLAGS -fno-builtin-memcmp"
-
-    # Flags to help ensure that certain portions of the code -- and only those
-    # portions -- can be built with MSVC:
-    # - src/util, src/gallium/auxiliary, and src/gallium/drivers/llvmpipe needs
-    #   to build with Windows SDK 7.0.7600, which bundles MSVC 2008
-    # - non-Linux/Posix OpenGL portions needs to build on MSVC 2013 (which
-    #   supports most of C99)
-    # - the rest has no compiler compiler restrictions
-    MSVC2013_COMPAT_CFLAGS="-Werror=vla -Werror=pointer-arith"
-    MSVC2013_COMPAT_CXXFLAGS="-Werror=vla -Werror=pointer-arith"
-    MSVC2008_COMPAT_CFLAGS="$MSVC2013_COMPAT_CFLAGS -Werror=declaration-after-statement"
-    MSVC2008_COMPAT_CXXFLAGS="$MSVC2013_COMPAT_CXXFLAGS"
 fi
 if test "x$GXX" = xyes; then
     CXXFLAGS="$CXXFLAGS -Wall"
@@ -300,11 +288,6 @@ if test "x$GXX" = xyes; then
     CXXFLAGS="$CXXFLAGS -fno-builtin-memcmp"
 fi
 
-AC_SUBST([MSVC2013_COMPAT_CFLAGS])
-AC_SUBST([MSVC2013_COMPAT_CXXFLAGS])
-AC_SUBST([MSVC2008_COMPAT_CFLAGS])
-AC_SUBST([MSVC2008_COMPAT_CXXFLAGS])
-
 dnl even if the compiler appears to support it, using visibility attributes isn't
 dnl going to do anything useful currently on cygwin apart from emit lots of warnings
 case "$host_os" in

diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
index a4db210..d21d8a9 100644 (file)
--- a/src/egl/main/Makefile.am
+++ b/src/egl/main/Makefile.am
@@ -26,7 +26,6 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/gbm/main \
        $(DEFINES) \
        $(VISIBILITY_CFLAGS) \
-       $(MSVC2013_COMPAT_CFLAGS) \
        $(EGL_CFLAGS) \
        -D_EGL_NATIVE_PLATFORM=$(EGL_NATIVE_PLATFORM) \
        -D_EGL_DRIVER_SEARCH_DIR=\"$(libdir)/egl\" \

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 27a8b3f..4b62057 100644 (file)
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -12,12 +12,9 @@ noinst_LTLIBRARIES = libgallium.la
 AM_CFLAGS = \
        -I$(top_srcdir)/src/gallium/auxiliary/util \
        $(GALLIUM_CFLAGS) \
-       $(VISIBILITY_CFLAGS) \
-       $(MSVC2008_COMPAT_CXXFLAGS)
+       $(VISIBILITY_CFLAGS)
 
-AM_CXXFLAGS = \
-       $(VISIBILITY_CXXFLAGS) \
-       $(MSVC2008_COMPAT_CXXFLAGS)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
 
 libgallium_la_SOURCES = \
        $(C_SOURCES) \

diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am
index 1d3853e..0bd4282 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile.am
+++ b/src/gallium/drivers/llvmpipe/Makefile.am
@@ -25,12 +25,10 @@ include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
        $(GALLIUM_DRIVER_CFLAGS) \
-       $(LLVM_CFLAGS) \
-       $(MSVC2008_COMPAT_CFLAGS)
+       $(LLVM_CFLAGS)
 AM_CXXFLAGS= \
        $(GALLIUM_DRIVER_CXXFLAGS) \
-       $(LLVM_CXXFLAGS) \
-       $(MSVC2008_COMPAT_CXXFLAGS)
+       $(LLVM_CXXFLAGS)
 
 noinst_LTLIBRARIES = libllvmpipe.la
 

diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
index f13fcb2..31546a7 100644 (file)
--- a/src/gallium/state_trackers/egl/Makefile.am
+++ b/src/gallium/state_trackers/egl/Makefile.am
@@ -27,8 +27,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
        $(GALLIUM_CFLAGS) \
-       $(VISIBILITY_CFLAGS) \
-       $(MSVC2013_COMPAT_CFLAGS)
+       $(VISIBILITY_CFLAGS)
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/egl/main \

diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 51c3f05..85f2ac1 100644 (file)
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -31,8 +31,7 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_TARGET_CFLAGS) \
-       $(MSVC2013_COMPAT_CFLAGS)
+       $(GALLIUM_TARGET_CFLAGS)
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/state_trackers/egl \

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index b466a3b..5a0a643 100644 (file)
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -33,12 +33,8 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gtest/include \
        -I$(top_builddir)/src/glsl/nir \
        $(DEFINES)
-AM_CFLAGS = \
-       $(VISIBILITY_CFLAGS) \
-       $(MSVC2013_COMPAT_CFLAGS)
-AM_CXXFLAGS = \
-       $(VISIBILITY_CXXFLAGS) \
-       $(MSVC2013_COMPAT_CXXFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
 
 EXTRA_DIST = tests glcpp/tests README TODO glcpp/README        \
        glsl_lexer.ll                                   \

diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 3d32279..36ddba8 100644 (file)
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -30,7 +30,6 @@ libloader_la_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
        $(VISIBILITY_CFLAGS) \
-       $(MSVC2013_COMPAT_CFLAGS) \
        $(LIBUDEV_CFLAGS)
 
 libloader_la_SOURCES = $(LOADER_C_FILES)

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index b0a6c8c..6794682 100644 (file)
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -39,9 +39,7 @@ EXTRA_DIST = \
        glapi/SConscript \
        shared-glapi/SConscript
 
-AM_CFLAGS = \
-       $(PTHREAD_CFLAGS) \
-       $(MSVC2013_COMPAT_CFLAGS)
+AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS =                                                  \
        $(DEFINES)                                              \
        $(SELINUX_CFLAGS)                                       \

diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index 5e9a820..b6cb8f1 100644 (file)
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -136,14 +136,8 @@ noinst_LTLIBRARIES += libmesagallium.la
 endif
 
 AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
-AM_CFLAGS = \
-       $(LLVM_CFLAGS) \
-       $(VISIBILITY_CFLAGS) \
-       $(MSVC2013_COMPAT_CFLAGS)
-AM_CXXFLAGS = \
-       $(LLVM_CFLAGS) \
-       $(VISIBILITY_CXXFLAGS) \
-       $(MSVC2013_COMPAT_CXXFLAGS)
+AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS)
+AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS)
 
 ARCH_LIBS =
 

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 29b66e7..9af2330 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -34,8 +34,7 @@ libmesautil_la_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
        $(SHA1_CFLAGS) \
-       $(VISIBILITY_CFLAGS) \
-       $(MSVC2008_COMPAT_CFLAGS)
+       $(VISIBILITY_CFLAGS)
 
 libmesautil_la_SOURCES = \
        $(MESA_UTIL_FILES) \