automake: Remove ARCH_FLAGS.

In all current uses, it was appended to CFLAGS, which already had -m32.  If
you want to do some other flag supplied to compiler invocations, there's
CFLAGS/CXXFLAGS.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/configs/current.in b/configs/current.in
index 9785a5a9cd36a9bf8112c5c30157322a65261293..1840632e7ea07ddf6bfa80741f7428eb1bd7b738 100644 (file)
--- a/configs/current.in
+++ b/configs/current.in
@@ -10,15 +10,14 @@ CONFIG_NAME = autoconf
 CC = @CC@
 CXX = @CXX@
 OPT_FLAGS = @OPT_FLAGS@
-ARCH_FLAGS = @ARCH_FLAGS@
 PIC_FLAGS = @PIC_FLAGS@
 DEFINES = @DEFINES@
 API_DEFINES = @API_DEFINES@
 SHARED_GLAPI = @SHARED_GLAPI@
 CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \
-       $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
+       $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES)
 CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \
-       $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
+       $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES)
 CFLAGS = $(CFLAGS_NOVISIBILITY) @VISIBILITY_CFLAGS@
 CXXFLAGS = $(CXXFLAGS_NOVISIBILITY) @VISIBILITY_CXXFLAGS@
 LDFLAGS = @LDFLAGS@

diff --git a/configure.ac b/configure.ac
index d9fc29cb9fec723276b9272f80f41666276b93d1..c81d18bb083334c7190fe5ff1204476565dd52c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -249,10 +249,7 @@ AC_SUBST([VISIBILITY_CXXFLAGS])
 dnl These should be unnecessary, but let the user set them if they want
 AC_ARG_VAR([OPT_FLAGS], [Additional optimization flags for the compiler.
     Default is to use CFLAGS.])
-AC_ARG_VAR([ARCH_FLAGS], [Additional architecture specific flags for the
-    compiler. Default is to use CFLAGS.])
 AC_SUBST([OPT_FLAGS])
-AC_SUBST([ARCH_FLAGS])
 
 dnl
 dnl Hacks to enable 32 or 64 bit build
@@ -266,7 +263,6 @@ AC_ARG_ENABLE([32-bit],
 if test "x$enable_32bit" = xyes; then
     if test "x$GCC" = xyes; then
         CFLAGS="$CFLAGS -m32"
-        ARCH_FLAGS="$ARCH_FLAGS -m32"
         CCASFLAGS="$CCASFLAGS -m32"
     fi
     if test "x$GXX" = xyes; then
@@ -2305,9 +2301,9 @@ echo "        Static libs:     $enable_static"
 
 dnl Compiler options
 # cleanup the CFLAGS/CXXFLAGS/DEFINES vars
-cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
+cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS | \
     $SED 's/^ *//;s/  */ /;s/ *$//'`
-cxxflags=`echo $CXXFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
+cxxflags=`echo $CXXFLAGS $OPT_FLAGS $PIC_FLAGS | \
     $SED 's/^ *//;s/  */ /;s/ *$//'`
 defines=`echo $DEFINES | $SED 's/^ *//;s/  */ /;s/ *$//'`
 echo ""

diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index 3d08611752a4a233297d19c5cedce6646760a26d..ca2b6c06e439d46350e910da9fbbd039f8060738 100644 (file)
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -16,7 +16,6 @@ AM_CFLAGS = \
        $(LLVM_CFLAGS) \
        $(RADEON_CFLAGS) \
        $(DEFINES) \
-       $(ARCH_FLAGS) \
        $(OPT_FLAGS) \
        $(PIC_FLAGS)
 

diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index ed89d2adfe9d696d01705637d8fe32a7bd42a047..65d0dff5dd7c722ce7d3a081af5b7f6d18d48b16 100644 (file)
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -9,7 +9,6 @@ AM_CFLAGS = \
        -I$(top_srcdir)/include \
        $(RADEON_CFLAGS) \
        $(DEFINES) \
-       $(ARCH_FLAGS) \
        $(OPT_FLAGS) \
        $(PIC_FLAGS) \
        $(VISIBILITY_CFLAGS)