summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Metzman <metzman@chromium.org>2019-04-30 17:58:56 +0000
committerJonathan Metzman <metzman@chromium.org>2019-04-30 17:58:56 +0000
commit430873b863d140a25d56ebb58b2b77459dcf7998 (patch)
treed0b71d915d8f97b47d992801f213bbd8ead461e5
parentb94e0d1016b55fd01df16d508944bd29e9a0a4d0 (diff)
downloadcompiler-rt-430873b863d140a25d56ebb58b2b77459dcf7998.tar.gz
[libFuzzer] Enable for i386
Summary: Get libFuzzer to build on i386 and fix tests. Subscribers: mgorny, #sanitizers, llvm-commits Tags: #sanitizers, #llvm Differential Revision: https://reviews.llvm.org/D61070 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@359585 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/fuzzer/CMakeLists.txt4
-rw-r--r--test/fuzzer/compressed.test2
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/fuzzer/CMakeLists.txt b/lib/fuzzer/CMakeLists.txt
index 42158cc26..3e50c086a 100644
--- a/lib/fuzzer/CMakeLists.txt
+++ b/lib/fuzzer/CMakeLists.txt
@@ -120,8 +120,8 @@ add_compiler_rt_runtime(clang_rt.fuzzer_no_main
if(OS_NAME MATCHES "Linux|Fuchsia" AND
COMPILER_RT_LIBCXX_PATH AND
COMPILER_RT_LIBCXXABI_PATH)
- macro(partially_link_libcxx name dir arch)
- if (${arch} MATCHES "i386")
+ macro(partially_link_libcxx name dir arch)
+ if(${arch} MATCHES "i386")
set(EMULATION_ARGUMENT "-m" "elf_i386")
else()
set(EMULATION_ARGUMENT "")
diff --git a/test/fuzzer/compressed.test b/test/fuzzer/compressed.test
index 4c539c222..37ea61330 100644
--- a/test/fuzzer/compressed.test
+++ b/test/fuzzer/compressed.test
@@ -1,5 +1,7 @@
REQUIRES: linux
REQUIRES: zlib
+# zlib is "supported" on i386 even when only for x86_64, explicitly make i386
+# unsupported by this test.
UNSUPPORTED: i386
# Custom mutator should find this bug, w/o custom -- no chance.
RUN: %cpp_compiler %S/CompressedTest.cpp -o %t-CompressedTestCustom -DCUSTOM_MUTATOR -lz