This is an archive of the discontinued LLVM Phabricator instance.

Differential D128548

[CMake][compiler-rt] Treat target cflags as list rather than string
ClosedPublic

Authored by phosek on Jun 24 2022, 11:57 AM.

Details

Reviewers
haowei
abrachet
Commits
rG72ec31afadd0: [CMake] Use set rather than list PREPEND
rG048e6bb46bc2: [CMake][compiler-rt] Treat target cflags as list rather than string
Summary

This is need after 30dfe016d4259398689dc1be163e0ecc804b5feb.

Diff Detail

Event Timeline

phosek created this revision.Jun 24 2022, 11:57 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 24 2022, 11:57 AM
Herald added subscribers: Enna1, mgorny. · View Herald Transcript
phosek requested review of this revision.Jun 24 2022, 11:57 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 24 2022, 11:57 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B171909: Diff 439835.Jun 24 2022, 12:23 PM
phosek updated this revision to Diff 439857.Jun 24 2022, 12:38 PM
Harbormaster completed remote builds in B171922: Diff 439857.Jun 24 2022, 12:58 PM
phosek updated this revision to Diff 439872.Jun 24 2022, 1:04 PM
phosek added a reviewer: abrachet.
phosek retitled this revision from [CMake][Fuzzer] Treat target cflags as list rather than string to [CMake][compiler-rt] Treat target cflags as list rather than string.
Herald added a subscriber: dberris. · View Herald TranscriptJun 24 2022, 1:06 PM
Harbormaster completed remote builds in B171935: Diff 439872.Jun 24 2022, 1:26 PM
abrachet accepted this revision.Jun 24 2022, 1:41 PM
This revision is now accepted and ready to land.Jun 24 2022, 1:41 PM
Closed by commit rG048e6bb46bc2: [CMake][compiler-rt] Treat target cflags as list rather than string (authored by phosek). · Explain WhyJun 24 2022, 3:37 PM
This revision was automatically updated to reflect the committed changes.
phosek added a commit: rG048e6bb46bc2: [CMake][compiler-rt] Treat target cflags as list rather than string.
phosek added a commit: rG72ec31afadd0: [CMake] Use set rather than list PREPEND.Jun 24 2022, 7:20 PM

Revision Contents

PathSize
compiler-rt/
cmake/
Modules/
2 lines
lib/
fuzzer/
2 lines

Diff 439908

compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake

include(CMakeParseArguments) include(CMakeParseArguments)
include(CompilerRTUtils) include(CompilerRTUtils)
function(get_aix_libatomic_default_link_flags link_flags export_list) function(get_aix_libatomic_default_link_flags link_flags export_list)
set(linkopts set(linkopts
-Wl,-H512 -Wl,-D0 -Wl,-H512 -Wl,-D0
-Wl,-T512 -Wl,-bhalt:4 -Wl,-bernotok -Wl,-T512 -Wl,-bhalt:4 -Wl,-bernotok
-Wl,-bnoentry -Wl,-bexport:${export_list} -Wl,-bnoentry -Wl,-bexport:${export_list}
-Wl,-bmodtype:SRE -Wl,-lc) -Wl,-bmodtype:SRE -Wl,-lc)
# Add `-Wl,-G`. Quoted from release notes of cmake-3.16.0 # Add `-Wl,-G`. Quoted from release notes of cmake-3.16.0
# > On AIX, runtime linking is no longer enabled by default. # > On AIX, runtime linking is no longer enabled by default.
# See https://cmake.org/cmake/help/latest/release/3.16.html # See https://cmake.org/cmake/help/latest/release/3.16.html
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
set(linkopts -Wl,-G ${linkopts}) list(PREPEND linkopts -Wl,-G)
endif() endif()
set(${link_flags} ${linkopts} PARENT_SCOPE) set(${link_flags} ${linkopts} PARENT_SCOPE)
endfunction() endfunction()
function(get_aix_libatomic_type type) function(get_aix_libatomic_type type)
if(${CMAKE_VERSION} VERSION_LESS "3.16.0") if(${CMAKE_VERSION} VERSION_LESS "3.16.0")
set(${type} SHARED PARENT_SCOPE) set(${type} SHARED PARENT_SCOPE)
else() else()
▲ Show 20 Lines • Show All 58 Lines • Show Last 20 Lines

compiler-rt/lib/fuzzer/CMakeLists.txt

Show First 20 Lines • Show All 135 Lines • ▼ Show 20 Lines
if(OS_NAME MATCHES "Linux|Fuchsia" AND if(OS_NAME MATCHES "Linux|Fuchsia" AND
COMPILER_RT_LIBCXX_PATH AND COMPILER_RT_LIBCXX_PATH AND
COMPILER_RT_LIBCXXABI_PATH) COMPILER_RT_LIBCXXABI_PATH)
macro(partially_link_libcxx name dir arch) macro(partially_link_libcxx name dir arch)
get_target_flags_for_arch(${arch} target_cflags) get_target_flags_for_arch(${arch} target_cflags)
if(CMAKE_CXX_COMPILER_ID MATCHES Clang) if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
get_compiler_rt_target(${arch} target) get_compiler_rt_target(${arch} target)
set(target_cflags "--target=${target} ${target_cflags}") list(PREPEND target_cflags --target=${target})
endif() endif()
set(cxx_${arch}_merge_dir "${CMAKE_CURRENT_BINARY_DIR}/cxx_${arch}_merge.dir") set(cxx_${arch}_merge_dir "${CMAKE_CURRENT_BINARY_DIR}/cxx_${arch}_merge.dir")
file(MAKE_DIRECTORY ${cxx_${arch}_merge_dir}) file(MAKE_DIRECTORY ${cxx_${arch}_merge_dir})
add_custom_command(TARGET clang_rt.${name}-${arch} POST_BUILD add_custom_command(TARGET clang_rt.${name}-${arch} POST_BUILD
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 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
COMMAND ${CMAKE_OBJCOPY} --localize-hidden ${name}.o COMMAND ${CMAKE_OBJCOPY} --localize-hidden ${name}.o
COMMAND ${CMAKE_COMMAND} -E remove "$<TARGET_LINKER_FILE:clang_rt.${name}-${arch}>" 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 COMMAND ${CMAKE_AR} qcs "$<TARGET_LINKER_FILE:clang_rt.${name}-${arch}>" ${name}.o
Show All 29 Lines