[compiler-rt] r359583 - Enable x86 builds

Tue Apr 30 11:25:51 PDT 2019

Got it, my bad. Thanks for the help and sorry all for the noise.

On Tue, Apr 30, 2019 at 11:00 AM Roman Lebedev <lebedev.ri at gmail.com> wrote:

> FYI git won't auto-squash commits, this change has landed as multiple
> commits.
>
> You should either do `arc patch` - best solution, good commit message
> as a bonus;
> or manually squash commits, and copy commit msg from the review, and add
> Differential Revision: <link>
> line.
>
> Roman.
>
> On Tue, Apr 30, 2019 at 8:56 PM Jonathan Metzman via llvm-commits
> <llvm-commits at lists.llvm.org> wrote:
> >
> > Author: metzman
> > Date: Tue Apr 30 10:58:54 2019
> > New Revision: 359583
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=359583&view=rev
> > Log:
> > Enable x86 builds
> >
> > Modified:
> >     compiler-rt/trunk/cmake/config-ix.cmake
> >     compiler-rt/trunk/lib/fuzzer/CMakeLists.txt
> >     compiler-rt/trunk/test/fuzzer/dataflow.test
> >     compiler-rt/trunk/test/fuzzer/fork.test
> >     compiler-rt/trunk/test/fuzzer/only-some-bytes.test
> >
> > Modified: compiler-rt/trunk/cmake/config-ix.cmake
> > URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=359583&r1=359582&r2=359583&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/cmake/config-ix.cmake (original)
> > +++ compiler-rt/trunk/cmake/config-ix.cmake Tue Apr 30 10:58:54 2019
> > @@ -230,7 +230,7 @@ set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH
> >  set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}
> >      ${MIPS32} ${MIPS64} ${PPC64} ${S390X})
> >  set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64})
> > -set(ALL_FUZZER_SUPPORTED_ARCH ${X86_64} ${ARM64})
> > +set(ALL_FUZZER_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM64})
> >
> >  if(APPLE)
> >    set(ALL_LSAN_SUPPORTED_ARCH ${X86} ${X86_64} ${MIPS64} ${ARM64})
> >
> > Modified: compiler-rt/trunk/lib/fuzzer/CMakeLists.txt
> > URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/fuzzer/CMakeLists.txt?rev=359583&r1=359582&r2=359583&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/lib/fuzzer/CMakeLists.txt (original)
> > +++ compiler-rt/trunk/lib/fuzzer/CMakeLists.txt Tue Apr 30 10:58:54 2019
> > @@ -120,11 +120,16 @@ add_compiler_rt_runtime(clang_rt.fuzzer_
> >  if(OS_NAME MATCHES "Linux|Fuchsia" AND
> >     COMPILER_RT_LIBCXX_PATH AND
> >     COMPILER_RT_LIBCXXABI_PATH)
> > -  macro(partially_link_libcxx name dir arch)
> > + macro(partially_link_libcxx name dir arch)
> > +    if (${arch} MATCHES "i386")
> > +      set(EMULATION_ARGUMENT "-m" "elf_i386")
> > +    else()
> > +      set(EMULATION_ARGUMENT "")
> > +    endif()
> >      set(cxx_${arch}_merge_dir
> "${CMAKE_CURRENT_BINARY_DIR}/cxx_${arch}_merge.dir")
> >      file(MAKE_DIRECTORY ${cxx_${arch}_merge_dir})
> >      add_custom_command(TARGET clang_rt.${name}-${arch} POST_BUILD
> > -      COMMAND ${CMAKE_LINKER} --whole-archive
> "$<TARGET_LINKER_FILE:clang_rt.${name}-${arch}>" --no-whole-archive
> ${dir}/lib/libc++.a -r -o ${name}.o
> > +      COMMAND ${CMAKE_LINKER} --whole-archive ${EMULATION_ARGUMENT}
> "$<TARGET_LINKER_FILE:clang_rt.${name}-${arch}>" --no-whole-archive
> ${dir}/lib/libc++.a -r -o ${name}.o
> >        COMMAND ${CMAKE_OBJCOPY} --localize-hidden ${name}.o
> >        COMMAND ${CMAKE_COMMAND} -E remove
> "$<TARGET_LINKER_FILE:clang_rt.${name}-${arch}>"
> >        COMMAND ${CMAKE_AR} qcs
> "$<TARGET_LINKER_FILE:clang_rt.${name}-${arch}>" ${name}.o
> >
> > Modified: compiler-rt/trunk/test/fuzzer/dataflow.test
> > URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/fuzzer/dataflow.test?rev=359583&r1=359582&r2=359583&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/test/fuzzer/dataflow.test (original)
> > +++ compiler-rt/trunk/test/fuzzer/dataflow.test Tue Apr 30 10:58:54 2019
> > @@ -1,6 +1,5 @@
> >  # Tests the data flow tracer.
> > -REQUIRES: linux
> > -UNSUPPORTED: aarch64
> > +REQUIRES: linux, x86_64
> >
> >  # Build the tracer and the test.
> >  RUN: %no_fuzzer_cpp_compiler -c -fno-sanitize=all -fsanitize=dataflow
> %S/../../lib/fuzzer/dataflow/DataFlow.cpp -o  %t-DataFlow.o
> >
> > Modified: compiler-rt/trunk/test/fuzzer/fork.test
> > URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/fuzzer/fork.test?rev=359583&r1=359582&r2=359583&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/test/fuzzer/fork.test (original)
> > +++ compiler-rt/trunk/test/fuzzer/fork.test Tue Apr 30 10:58:54 2019
> > @@ -11,8 +11,8 @@ OOM: ERROR: libFuzzer: out-of-memory
> >  RUN: %cpp_compiler %S/OutOfMemoryTest.cpp -o %t-OutOfMemoryTest
> >  RUN: not %run %t-OutOfMemoryTest -fork=1 -ignore_ooms=0
> -rss_limit_mb=128 2>&1 | FileCheck %s --check-prefix=OOM
> >
> > -# access-violation is the error thrown on Windows.
> > -CRASH: {{SEGV|access-violation}} on unknown address 0x000000000000
> > +# access-violation is the error thrown on Windows. Address will be
> smaller on x86.
> > +CRASH: {{SEGV|access-violation}} on unknown address
> {{0x000000000000|0x00000000}}
> >  RUN: %cpp_compiler %S/ShallowOOMDeepCrash.cpp -o %t-ShallowOOMDeepCrash
> >  RUN: not %run %t-ShallowOOMDeepCrash -fork=1 -rss_limit_mb=128 2>&1 |
> FileCheck %s --check-prefix=CRASH
> >
> >
> > Modified: compiler-rt/trunk/test/fuzzer/only-some-bytes.test
> > URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/fuzzer/only-some-bytes.test?rev=359583&r1=359582&r2=359583&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/test/fuzzer/only-some-bytes.test (original)
> > +++ compiler-rt/trunk/test/fuzzer/only-some-bytes.test Tue Apr 30
> 10:58:54 2019
> > @@ -1,6 +1,5 @@
> >  # Tests the data flow tracer.
> > -REQUIRES: linux
> > -UNSUPPORTED: aarch64
> > +REQUIRES: linux, x86_64
> >
> >  # Build the tracer and the test.
> >  RUN: %no_fuzzer_cpp_compiler -c -fno-sanitize=all -fsanitize=dataflow
> %S/../../lib/fuzzer/dataflow/DataFlow.cpp -o  %t-DataFlow.o
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at lists.llvm.org
> > https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190430/469c5acf/attachment.html>