Commit e314cfdc authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r243615: 

------------------------------------------------------------------------
r243615 | nico | 2015-07-29 20:41:05 -0700 (Wed, 29 Jul 2015) | 1 line

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

llvm-svn: 243617
parent 0a72d8f8

compiler-rt/cmake/config-ix.cmake

+1 −2
Original line number Diff line number Diff line
@@ -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)

compiler-rt/test/sanitizer_common/TestCases/Linux/open_memstream.cc

+2 −2
Original line number Diff line number Diff line 
// 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>