From 38a8aecfb882072900434499696b5c32a2274515 Mon Sep 17 00:00:00 2001 From: Rong Xu Date: Mon, 21 Jul 2014 16:47:22 -0700 Subject: [4.9] Switch gcc-4.9 to use google/gcc-4_9 branch. This source drop uses svn version r212828 of google/gcc-4.9 branch. We also cherry-picked r213062, r213063 and r213064 to fix windows build issues. All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9. The following prior commits has not been merged to google branch yet. (They are included in this commit). e7af147f979e657fe2df00808e5b4319b0e088c6, baf87df3cb2683649ba7e9872362a7e721117c23, and c231900e5dcc14d8296bd9f62b45997a49d4d5e7. Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b --- gcc-4.9/libatomic/.gitignore | 2 ++ gcc-4.9/libatomic/configure | 36 ++++++++++++++++++++----- gcc-4.9/libatomic/configure.ac | 1 + gcc-4.9/libatomic/testsuite/atomicconfig.exp.in | 2 ++ gcc-4.9/libatomic/testsuite/config/default.exp | 1 + gcc-4.9/libatomic/testsuite/lib/libatomic.exp | 2 +- 6 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 gcc-4.9/libatomic/.gitignore create mode 100644 gcc-4.9/libatomic/testsuite/atomicconfig.exp.in (limited to 'gcc-4.9/libatomic') diff --git a/gcc-4.9/libatomic/.gitignore b/gcc-4.9/libatomic/.gitignore new file mode 100644 index 000000000..361f15c84 --- /dev/null +++ b/gcc-4.9/libatomic/.gitignore @@ -0,0 +1,2 @@ +autom4te.cache +auto-config.h.in~ diff --git a/gcc-4.9/libatomic/configure b/gcc-4.9/libatomic/configure index d707b096c..5ca62abc2 100755 --- a/gcc-4.9/libatomic/configure +++ b/gcc-4.9/libatomic/configure @@ -655,6 +655,7 @@ CCAS am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -3131,11 +3132,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -4033,6 +4034,7 @@ fi if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -4057,6 +4059,7 @@ else # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4116,7 +4119,7 @@ else break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -4191,6 +4194,7 @@ else # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4248,7 +4252,7 @@ else break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -7707,7 +7711,22 @@ fi # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; p=${PACKAGE-default} + case "$withval" in + yes|no) pic_mode="$withval" ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -15230,6 +15249,8 @@ fi ac_config_files="$ac_config_files Makefile testsuite/Makefile" +ac_config_files="$ac_config_files testsuite/atomicconfig.exp" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -16278,6 +16299,7 @@ do "gstdint.h") CONFIG_COMMANDS="$CONFIG_COMMANDS gstdint.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; + "testsuite/atomicconfig.exp") CONFIG_FILES="$CONFIG_FILES testsuite/atomicconfig.exp" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/gcc-4.9/libatomic/configure.ac b/gcc-4.9/libatomic/configure.ac index 9e8678df5..ff241c26a 100644 --- a/gcc-4.9/libatomic/configure.ac +++ b/gcc-4.9/libatomic/configure.ac @@ -255,4 +255,5 @@ else fi AC_CONFIG_FILES(Makefile testsuite/Makefile) +AC_CONFIG_FILES(testsuite/atomicconfig.exp) AC_OUTPUT diff --git a/gcc-4.9/libatomic/testsuite/atomicconfig.exp.in b/gcc-4.9/libatomic/testsuite/atomicconfig.exp.in new file mode 100644 index 000000000..5a5b7ccf6 --- /dev/null +++ b/gcc-4.9/libatomic/testsuite/atomicconfig.exp.in @@ -0,0 +1,2 @@ +global GCC_UNDER_TEST +set GCC_UNDER_TEST "@CC@" diff --git a/gcc-4.9/libatomic/testsuite/config/default.exp b/gcc-4.9/libatomic/testsuite/config/default.exp index ccfda11bc..eeda74880 100644 --- a/gcc-4.9/libatomic/testsuite/config/default.exp +++ b/gcc-4.9/libatomic/testsuite/config/default.exp @@ -15,3 +15,4 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. load_lib "standard.exp" +load_lib "atomicconfig.exp" diff --git a/gcc-4.9/libatomic/testsuite/lib/libatomic.exp b/gcc-4.9/libatomic/testsuite/lib/libatomic.exp index 23c3b0828..1b53ec635 100644 --- a/gcc-4.9/libatomic/testsuite/lib/libatomic.exp +++ b/gcc-4.9/libatomic/testsuite/lib/libatomic.exp @@ -120,7 +120,7 @@ proc libatomic_init { args } { set compiler [lindex $GCC_UNDER_TEST 0] if { [is_remote host] == 0 && [which $compiler] != 0 } { - foreach i "[exec $compiler --print-multi-lib]" { + foreach i "[eval "exec $GCC_UNDER_TEST --print-multi-lib"]" { set mldir "" regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir set mldir [string trimright $mldir "\;@"] -- cgit v1.2.3