From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Thu, 8 Dec 2011 10:39:26 +0000 (-0700)
Subject: Cleanup: Removed now useless -fhuge-objects GCC compiler flag
X-Git-Tag: SQUID_3_2_0_14~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cb3a6ca7f8a982fc605007a4fc4d6cf311f7069;p=thirdparty%2Fsquid.git

Cleanup: Removed now useless -fhuge-objects GCC compiler flag
---

diff --git a/acinclude/compiler-flags.m4 b/acinclude/compiler-flags.m4
index 5b4a5fb852..5757c5c804 100644
--- a/acinclude/compiler-flags.m4
+++ b/acinclude/compiler-flags.m4
@@ -47,19 +47,6 @@ AC_DEFUN([SQUID_CC_CHECK_ARGUMENT],[
   }])
 ])
 
-# check if the c++ compiler supports the -fhuge-objects flag
-# sets the variable squid_cv_cxx_arg_fhugeobjects to either "yes" or "no"
-#
-AC_DEFUN([SQUID_CXX_CHECK_ARG_FHUGEOBJECTS],[
-  AC_LANG_PUSH([C++])
-  if test "$GCC" = "yes"; then
-    SQUID_CC_CHECK_ARGUMENT([squid_cv_cxx_arg_fhugeobjects],[-Werror -fhuge-objects])
-  else
-    squid_cv_cxx_arg_fhugeobjects=no
-  fi
-  AC_LANG_POP([C++])
-])
-
 # detect what kind of compiler we're using, either by using hints from
 # autoconf itself, or by using predefined preprocessor macros
 # sets the variable squid_cv_compiler to one of
diff --git a/configure.ac b/configure.ac
index 70c9199476..4973e5efe2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -321,10 +321,6 @@ if test "x$enable_strict_error_checking" != "xno"; then
   SQUID_CXXFLAGS="$SQUID_CXXFLAGS $squid_cv_cxx_option_werror"
 fi
 
-SQUID_CXX_CHECK_ARG_FHUGEOBJECTS
-if test "x$squid_cv_cxx_arg_fhugeobjects" = "xyes"; then
-  SQUID_CXXFLAGS="$SQUID_CXXFLAGS -fhuge-objects"
-fi
 # squid_cv_cc_arg_pipe is set by SQUID_CC_GUESS_OPTIONS
 SQUID_CXXFLAGS="$SQUID_CXXFLAGS $squid_cv_cc_arg_pipe"
 SQUID_CFLAGS="$SQUID_CFLAGS $squid_cv_cc_arg_pipe"
diff --git a/lib/libTrie/acinclude.m4 b/lib/libTrie/acinclude.m4
index 981bfbbc1b..ae7da3eae0 100644
--- a/lib/libTrie/acinclude.m4
+++ b/lib/libTrie/acinclude.m4
@@ -1,33 +1 @@
 dnl
-dnl thanks to autogen, for the template..
-dnl
-dnl @synopsis  AC_TEST_CHECKFORHUGEOBJECTS
-dnl
-dnl Test whether -fhuge-objects is available with this c++ compiler. gcc-29.5 series compilers need this on some platform with large objects.
-dnl
-HUGE_OBJECT_FLAG=""
-AC_DEFUN([AC_TEST_CHECKFORHUGEOBJECTS],[
- if test "$GCC" = "yes"; then
-  AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
-  AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
-    ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
-res=$?
-rm -f conftest.*
-echo yes
-exit $res`
-    if [[ $? -ne 0 ]]
-    then ac_cv_test_checkforhugeobjects=no
-    else if [[ -z "$ac_cv_test_checkforhugeobjects" ]]
-         then ac_cv_test_checkforhugeobjects=yes
-    fi ; fi
-  ]) # end of CACHE_VAL
-  AC_MSG_RESULT([${ac_cv_test_checkforhugeobjects}])
-
-  if test "X${ac_cv_test_checkforhugeobjects}" != Xno
-  then
-    HUGE_OBJECT_FLAG="-fhuge-objects"
-  fi
- fi #gcc
-]) # end of AC_DEFUN of AC_TEST_CHECKFORHUGEOBJECTS
-
diff --git a/lib/libTrie/configure.ac b/lib/libTrie/configure.ac
index a90d34a297..7fcfec68c5 100644
--- a/lib/libTrie/configure.ac
+++ b/lib/libTrie/configure.ac
@@ -89,8 +89,6 @@ if test "$GCC" = "yes"; then
      TRIE_CXXFLAGS="-Werror $TRIE_CXXFLAGS"
   fi
 
-  AC_TEST_CHECKFORHUGEOBJECTS
-  TRIE_CXXFLAGS="$TRIE_CXXFLAGS $HUGE_OBJECT_FLAG"
 fi
 
 AC_SUBST(TRIE_CFLAGS)