diff options
| author | Hans Wennborg <hans@hanshq.net> | 2015-07-30 04:28:50 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2015-07-30 04:28:50 +0000 |
| commit | 6935ae659b6d7084e94fa5d5473c8cdcbdca2f13 (patch) | |
| tree | 2671e9722c1ac43b89cc6728c49935dd40433bf9 | |
| parent | b07bdb6a2756415a411e37c69e073ecb10f5832a (diff) | |
| download | compiler-rt-6935ae659b6d7084e94fa5d5473c8cdcbdca2f13.tar.gz | |
Merging r243615:
------------------------------------------------------------------------
r243615 | nico | 2015-07-29 20:41:05 -0700 (Wed, 29 Jul 2015) | 1 line
Revert r243604, it (very likely) caused PR24312.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_37@243617 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | cmake/config-ix.cmake | 3 | ||||
| -rw-r--r-- | test/sanitizer_common/TestCases/Linux/open_memstream.cc | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index a61b6dd18..c645be4d8 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -179,8 +179,7 @@ else() # FIXME: We build runtimes for both i686 and i386, as "clang -m32" may # target different variant than "$CMAKE_C_COMPILER -m32". This part should # be gone after we resolve PR14109. - # Use -march to make sure Clang defines __i686__; see PR24222. - test_target_arch(i686 __i686__ "-m32" "-march=i686") + test_target_arch(i686 __i686__ "-m32") test_target_arch(i386 __i386__ "-m32") else() if (CMAKE_SIZEOF_VOID_P EQUAL 4) diff --git a/test/sanitizer_common/TestCases/Linux/open_memstream.cc b/test/sanitizer_common/TestCases/Linux/open_memstream.cc index 8f725c322..69097c094 100644 --- a/test/sanitizer_common/TestCases/Linux/open_memstream.cc +++ b/test/sanitizer_common/TestCases/Linux/open_memstream.cc @@ -1,5 +1,5 @@ -// RUN: %clangxx -m64 -march=x86-64 -O0 -g -xc++ %s -o %t && %run %t -// RUN: %clangxx -m64 -march=x86-64 -O3 -g -xc++ %s -o %t && %run %t +// RUN: %clangxx -m64 -O0 -g -xc++ %s -o %t && %run %t +// RUN: %clangxx -m64 -O3 -g -xc++ %s -o %t && %run %t // REQUIRES: x86_64-supported-target #include <assert.h> |