diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2015-07-30 03:41:05 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2015-07-30 03:41:05 +0000 |
| commit | 64fcf5258c5e73581502dd6369e3aa161d0c8f56 (patch) | |
| tree | 2c075f5cdc805ebafa0fb45d8ab0ff6ec3705631 | |
| parent | 9edd4e46e661b1c521992518e779ad9eb62e3c38 (diff) | |
Revert r243604, it (very likely) caused PR24312.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@243615 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 9f7227245..b5f8f596b 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -180,8 +180,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 8ebb6de84..3bce030dd 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> |