This is an archive of the discontinued LLVM Phabricator instance.

Differential D104908

[AIX][compiler-rt] Deliver libatomic.a at top level library directory
ClosedPublic

Authored by lkail on Jun 25 2021, 4:45 AM.

Details

Reviewers
jsji
jasonliu
daltenty
hubert.reinterpretcast
xingxue
Group Reviewers
Restricted Project
Commits
rGae79854e1c59: [AIX][compiler-rt] Deliver libatomic.a at top level library directory
Summary

Install libatomic.a in top level library directory so that compiler can find it in search directories.

Diff Detail

Event Timeline

lkail created this revision.Jun 25 2021, 4:45 AM
Herald added subscribers: jfb, mgorny. · View Herald TranscriptJun 25 2021, 4:45 AM
lkail requested review of this revision.Jun 25 2021, 4:45 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 25 2021, 4:45 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
lkail retitled this revision from [AIX] Deliver libatomic.a at top level library directory to [AIX][compiler-rt] Deliver libatomic.a at top level library directory.Jun 25 2021, 4:46 AM
Herald added a subscriber: dberris. · View Herald TranscriptJun 25 2021, 4:46 AM
Harbormaster completed remote builds in B110972: Diff 354466.Jun 25 2021, 5:28 AM
lkail added a reviewer: xingxue.Jun 25 2021, 5:58 AM
jsji accepted this revision as: jsji.Jun 28 2021, 10:24 AM

LGTM. Thanks.

This revision is now accepted and ready to land.Jun 28 2021, 10:24 AM
Closed by commit rGae79854e1c59: [AIX][compiler-rt] Deliver libatomic.a at top level library directory (authored by lkail). · Explain WhyJun 28 2021, 8:14 PM
This revision was automatically updated to reflect the committed changes.
lkail added a commit: rGae79854e1c59: [AIX][compiler-rt] Deliver libatomic.a at top level library directory.

Revision Contents

PathSize
compiler-rt/
cmake/
Modules/
12 lines

Diff 355101

compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Lines if(CAN_TARGET_${arch})
DEPENDS ${target}) DEPENDS ${target})
list(APPEND shared_libraries_to_archive "${output_dir}/libatomic.so.1") list(APPEND shared_libraries_to_archive "${output_dir}/libatomic.so.1")
endif() endif()
endif() endif()
endforeach() endforeach()
if(shared_libraries_to_archive) if(shared_libraries_to_archive)
set(output_dir "") set(output_dir "")
set(install_dir "") set(install_dir "")
# If LLVM defines top level library directory, we want to deliver
# libatomic.a at top level. See `llvm/cmake/modules/AddLLVM.cmake'
# setting _install_rpath on AIX for reference.
if(LLVM_LIBRARY_OUTPUT_INTDIR AND CMAKE_INSTALL_PREFIX)
set(output_dir "${LLVM_LIBRARY_OUTPUT_INTDIR}")
set(install_dir "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}")
else()
get_compiler_rt_output_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} output_dir) get_compiler_rt_output_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} output_dir)
get_compiler_rt_install_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} install_dir) get_compiler_rt_install_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} install_dir)
endif()
add_custom_command(OUTPUT "${output_dir}/libatomic.a" add_custom_command(OUTPUT "${output_dir}/libatomic.a"
COMMAND ${CMAKE_AR} -X32_64 r "${output_dir}/libatomic.a" COMMAND ${CMAKE_AR} -X32_64 r "${output_dir}/libatomic.a"
${shared_libraries_to_archive} ${shared_libraries_to_archive}
DEPENDS ${shared_libraries_to_archive}) DEPENDS ${shared_libraries_to_archive})
install(FILES "${output_dir}/libatomic.a" install(FILES "${output_dir}/libatomic.a"
DESTINATION ${install_dir}) DESTINATION ${install_dir})
add_custom_target(aix-libatomic add_custom_target(aix-libatomic
DEPENDS "${output_dir}/libatomic.a") DEPENDS "${output_dir}/libatomic.a")
endif() endif()
add_dependencies(${LIB_PARENT_TARGET} aix-libatomic) add_dependencies(${LIB_PARENT_TARGET} aix-libatomic)
endmacro() endmacro()