diff options
| author | Jonathan Metzman <metzman@chromium.org> | 2019-04-30 17:58:54 +0000 |
|---|---|---|
| committer | Jonathan Metzman <metzman@chromium.org> | 2019-04-30 17:58:54 +0000 |
| commit | f721230831c5aec709b1d1720452e80d7306c91d (patch) | |
| tree | bf6cf5e4d4101b5e636366ba994513d8f19faea4 /compiler-rt/lib/fuzzer | |
| parent | 3958719ddafb7459b35ae44255c41940086317a4 (diff) | |
| download | bcm5719-llvm-f721230831c5aec709b1d1720452e80d7306c91d.tar.gz bcm5719-llvm-f721230831c5aec709b1d1720452e80d7306c91d.zip | |
Enable x86 builds
llvm-svn: 359583
Diffstat (limited to 'compiler-rt/lib/fuzzer')
| -rw-r--r-- | compiler-rt/lib/fuzzer/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/compiler-rt/lib/fuzzer/CMakeLists.txt b/compiler-rt/lib/fuzzer/CMakeLists.txt index 602f332974f..42158cc26e2 100644 --- a/compiler-rt/lib/fuzzer/CMakeLists.txt +++ b/compiler-rt/lib/fuzzer/CMakeLists.txt @@ -120,11 +120,16 @@ 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) + 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 |
