This is an archive of the discontinued LLVM Phabricator instance.

Differential D65773

Build libfuzzer libcxx-static with PIC
ClosedPublic

Authored by kongyi on Aug 5 2019, 1:33 PM.

Details

Reviewers
phosek
ldionne
EricWF
Commits
rG295d4b7727ca: Build libfuzzer libcxx-static with PIC
rL367943: Build libfuzzer libcxx-static with PIC
rCRT367943: Build libfuzzer libcxx-static with PIC
Summary

r356153 changed default build option of static libcxx to no PIC. We now need to explicitly specify CMAKE_POSITION_INDEPENDENT_CODE to get PIC libcxx.

Diff Detail

Event Timeline

kongyi created this revision.Aug 5 2019, 1:33 PM
Herald added a reviewer: EricWF. · View Herald TranscriptAug 5 2019, 1:33 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, Restricted Project, dexonsmith, mgorny. · View Herald Transcript
phosek accepted this revision.Aug 5 2019, 3:51 PM

LGTM

This revision is now accepted and ready to land.Aug 5 2019, 3:51 PM
Closed by commit rL367943: Build libfuzzer libcxx-static with PIC (authored by kongyi). · Explain WhyAug 5 2019, 3:56 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: delcypher. · View Herald TranscriptAug 5 2019, 3:56 PM

Revision Contents

PathSize
compiler-rt/
lib/
fuzzer/
1 line

Diff 213449

compiler-rt/lib/fuzzer/CMakeLists.txt

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Linesif(OS_NAME MATCHES "Linux|Fuchsia" AND
endmacro() endmacro()
foreach(arch ${FUZZER_SUPPORTED_ARCH}) foreach(arch ${FUZZER_SUPPORTED_ARCH})
get_target_flags_for_arch(${arch} TARGET_CFLAGS) get_target_flags_for_arch(${arch} TARGET_CFLAGS)
set(LIBCXX_${arch}_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libcxx_fuzzer_${arch}) set(LIBCXX_${arch}_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libcxx_fuzzer_${arch})
add_custom_libcxx(libcxx_fuzzer_${arch} ${LIBCXX_${arch}_PREFIX} add_custom_libcxx(libcxx_fuzzer_${arch} ${LIBCXX_${arch}_PREFIX}
CFLAGS ${TARGET_CFLAGS} CFLAGS ${TARGET_CFLAGS}
CMAKE_ARGS -DCMAKE_CXX_COMPILER_WORKS=ON CMAKE_ARGS -DCMAKE_CXX_COMPILER_WORKS=ON
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DLIBCXX_ABI_NAMESPACE=Fuzzer) -DLIBCXX_ABI_NAMESPACE=Fuzzer)
target_compile_options(RTfuzzer.${arch} PRIVATE -isystem ${LIBCXX_${arch}_PREFIX}/include/c++/v1) target_compile_options(RTfuzzer.${arch} PRIVATE -isystem ${LIBCXX_${arch}_PREFIX}/include/c++/v1)
add_dependencies(RTfuzzer.${arch} libcxx_fuzzer_${arch}-build) add_dependencies(RTfuzzer.${arch} libcxx_fuzzer_${arch}-build)
target_compile_options(RTfuzzer_main.${arch} PRIVATE -isystem ${LIBCXX_${arch}_PREFIX}/include/c++/v1) target_compile_options(RTfuzzer_main.${arch} PRIVATE -isystem ${LIBCXX_${arch}_PREFIX}/include/c++/v1)
add_dependencies(RTfuzzer_main.${arch} libcxx_fuzzer_${arch}-build) add_dependencies(RTfuzzer_main.${arch} libcxx_fuzzer_${arch}-build)
partially_link_libcxx(fuzzer_no_main ${LIBCXX_${arch}_PREFIX} ${arch}) partially_link_libcxx(fuzzer_no_main ${LIBCXX_${arch}_PREFIX} ${arch})
partially_link_libcxx(fuzzer ${LIBCXX_${arch}_PREFIX} ${arch}) partially_link_libcxx(fuzzer ${LIBCXX_${arch}_PREFIX} ${arch})
endforeach() endforeach()
endif() endif()
if(COMPILER_RT_INCLUDE_TESTS) if(COMPILER_RT_INCLUDE_TESTS)
add_subdirectory(tests) add_subdirectory(tests)
endif() endif()