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