diff options
| author | Rong Xu <xur@google.com> | 2014-07-21 16:47:22 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-07-29 15:31:03 -0700 |
| commit | 38a8aecfb882072900434499696b5c32a2274515 (patch) | |
| tree | 2aac97f0ae24b03cd98c1a06e989c031c173f889 /gcc-4.9/libatomic/testsuite | |
| parent | c231900e5dcc14d8296bd9f62b45997a49d4d5e7 (diff) | |
| download | toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.gz toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.bz2 toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.zip | |
[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
Diffstat (limited to 'gcc-4.9/libatomic/testsuite')
| -rw-r--r-- | gcc-4.9/libatomic/testsuite/atomicconfig.exp.in | 2 | ||||
| -rw-r--r-- | gcc-4.9/libatomic/testsuite/config/default.exp | 1 | ||||
| -rw-r--r-- | gcc-4.9/libatomic/testsuite/lib/libatomic.exp | 2 |
3 files changed, 4 insertions, 1 deletions
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 "\;@"] |