[llvm-branch-commits] [compiler-rt-branch] r243617 - Merging r243615:

[Hans Wennborg]

Author: hans
Date: Wed Jul 29 23:28:50 2015
New Revision: 243617

URL: http://llvm.org/viewvc/llvm-project?rev=243617&view=rev
Log:
Merging r243615:
------------------------------------------------------------------------
r243615 | nico | 2015-07-29 20:41:05 -0700 (Wed, 29 Jul 2015) | 1 line

Revert r243604, it (very likely) caused PR24312.
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_37/   (props changed)
    compiler-rt/branches/release_37/cmake/config-ix.cmake
    compiler-rt/branches/release_37/test/sanitizer_common/TestCases/Linux/open_memstream.cc

Propchange: compiler-rt/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 29 23:28:50 2015
@@ -1 +1 @@
-/compiler-rt/trunk:242350,242424,242444,242449,242539-242540,242647,242651,243170,243604
+/compiler-rt/trunk:242350,242424,242444,242449,242539-242540,242647,242651,243170,243604,243615

Modified: compiler-rt/branches/release_37/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_37/cmake/config-ix.cmake?rev=243617&r1=243616&r2=243617&view=diff
==============================================================================
--- compiler-rt/branches/release_37/cmake/config-ix.cmake (original)
+++ compiler-rt/branches/release_37/cmake/config-ix.cmake Wed Jul 29 23:28:50 2015
@@ -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)

Modified: compiler-rt/branches/release_37/test/sanitizer_common/TestCases/Linux/open_memstream.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_37/test/sanitizer_common/TestCases/Linux/open_memstream.cc?rev=243617&r1=243616&r2=243617&view=diff
==============================================================================
--- compiler-rt/branches/release_37/test/sanitizer_common/TestCases/Linux/open_memstream.cc (original)
+++ compiler-rt/branches/release_37/test/sanitizer_common/TestCases/Linux/open_memstream.cc Wed Jul 29 23:28:50 2015
@@ -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>