revert-llvmorg-15-init-13446-g7524fe962e47.patch (1963B)
1 From 12f64ca10837bd68ec30804ebfa21653925ad5cf Mon Sep 17 00:00:00 2001 2 From: Mike Hommey <mh@glandium.org> 3 Date: Thu, 16 Jun 2022 12:51:29 +0900 4 Subject: [PATCH] Revert "[libFuzzer] Use the compiler to link the relocatable 5 object" 6 7 This reverts commit 7524fe962e479416fd6318407eff4eed5b96a40b. 8 --- 9 compiler-rt/lib/fuzzer/CMakeLists.txt | 10 +++++----- 10 1 file changed, 5 insertions(+), 5 deletions(-) 11 12 diff --git a/compiler-rt/lib/fuzzer/CMakeLists.txt b/compiler-rt/lib/fuzzer/CMakeLists.txt 13 index 856cd732d517..d51de53f5acc 100644 14 --- a/compiler-rt/lib/fuzzer/CMakeLists.txt 15 +++ b/compiler-rt/lib/fuzzer/CMakeLists.txt 16 @@ -138,15 +138,15 @@ if(OS_NAME MATCHES "Linux|Fuchsia" AND 17 COMPILER_RT_LIBCXX_PATH AND 18 COMPILER_RT_LIBCXXABI_PATH) 19 macro(partially_link_libcxx name dir arch) 20 - get_target_flags_for_arch(${arch} target_cflags) 21 - if(CMAKE_CXX_COMPILER_ID MATCHES Clang) 22 - get_compiler_rt_target(${arch} target) 23 - set(target_cflags --target=${target} ${target_cflags}) 24 + if(${arch} MATCHES "i386") 25 + set(EMULATION_ARGUMENT "-m" "elf_i386") 26 + else() 27 + set(EMULATION_ARGUMENT "") 28 endif() 29 set(cxx_${arch}_merge_dir "${CMAKE_CURRENT_BINARY_DIR}/cxx_${arch}_merge.dir") 30 file(MAKE_DIRECTORY ${cxx_${arch}_merge_dir}) 31 add_custom_command(TARGET clang_rt.${name}-${arch} POST_BUILD 32 - COMMAND ${CMAKE_CXX_COMPILER} ${target_cflags} -Wl,--whole-archive "$<TARGET_LINKER_FILE:clang_rt.${name}-${arch}>" -Wl,--no-whole-archive ${dir}/lib/libc++.a -r -o ${name}.o 33 + COMMAND ${CMAKE_LINKER} ${EMULATION_ARGUMENT} --whole-archive "$<TARGET_LINKER_FILE:clang_rt.${name}-${arch}>" --no-whole-archive ${dir}/lib/libc++.a -r -o ${name}.o 34 COMMAND ${CMAKE_OBJCOPY} --localize-hidden ${name}.o 35 COMMAND ${CMAKE_COMMAND} -E remove "$<TARGET_LINKER_FILE:clang_rt.${name}-${arch}>" 36 COMMAND ${CMAKE_AR} qcs "$<TARGET_LINKER_FILE:clang_rt.${name}-${arch}>" ${name}.o 37 -- 38 2.36.0.1.g2bbe56bd8d