This is an archive of the discontinued LLVM Phabricator instance.

Differential D103824

[AIX] Build libLTO as MODULE rather than SHARED
ClosedPublic

Authored by daltenty on Jun 7 2021, 9:26 AM.

Details

Reviewers
w2yehia
hubert.reinterpretcast
Commits
rG75d4f55d150c: [AIX] Build libLTO as MODULE rather than SHARED
Summary

On CMake versions greater that >= 3.16 on AIX, shared libraries are
created as archives (which is the normal form for the platform). However
plugins libraries which are passed directly to a executable, like
libLTO to the linker, are usual build as plain .so, so this patch
restores this behaviour for libLTO on AIX (and adjust the name if need be
to account for the fact that llvm_add_library likes to force an empty
name prefix on modules), so we end up with the expected libLTO.so

Diff Detail

Event Timeline

daltenty created this revision.Jun 7 2021, 9:26 AM
Herald added subscribers: ormris, steven_wu, hiraditya and 2 others. · View Herald TranscriptJun 7 2021, 9:26 AM
daltenty requested review of this revision.Jun 7 2021, 9:26 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 7 2021, 9:26 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
daltenty added reviewers: w2yehia, hubert.reinterpretcast.Jun 7 2021, 9:27 AM
Harbormaster completed remote builds in B108013: Diff 350328.Jun 7 2021, 10:34 AM
ormris removed a subscriber: ormris.Jun 7 2021, 4:07 PM
w2yehia added inline comments.Jun 8 2021, 10:32 AM
llvm/tools/lto/CMakeLists.txt
31

80 chars?

w2yehia added a comment.Jun 8 2021, 5:08 PM

LGTM

llvm/tools/lto/CMakeLists.txt
23–24

can we loosen the condition to apply to all versions of cmake on AIX?

daltenty updated this revision to Diff 351183.Jun 10 2021, 8:15 AM
  • Address comments
daltenty marked an inline comment as done.Jun 10 2021, 8:16 AM
daltenty added inline comments.
llvm/tools/lto/CMakeLists.txt
23–24

Sure, this change shouldn't have a negative affect on older versions

w2yehia accepted this revision.Jun 10 2021, 8:32 AM
This revision is now accepted and ready to land.Jun 10 2021, 8:32 AM
This revision was landed with ongoing or failed builds.Jun 10 2021, 9:10 AM
Closed by commit rG75d4f55d150c: [AIX] Build libLTO as MODULE rather than SHARED (authored by daltenty). · Explain Why
This revision was automatically updated to reflect the committed changes.
daltenty added a commit: rG75d4f55d150c: [AIX] Build libLTO as MODULE rather than SHARED.
Harbormaster completed remote builds in B108631: Diff 351183.Jun 10 2021, 9:31 AM

Revision Contents

PathSize
llvm/
tools/
lto/
12 lines

Diff 351193

llvm/tools/lto/CMakeLists.txt

Show All 14 Linesset(LLVM_LINK_COMPONENTS
) )
set(SOURCES set(SOURCES
LTODisassembler.cpp LTODisassembler.cpp
lto.cpp lto.cpp
) )
set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports)
add_llvm_library(LTO SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES} DEPENDS if(CMAKE_SYSTEM_NAME STREQUAL AIX)
w2yehiaUnsubmitted
Not Done
ReplyInline Actions

can we loosen the condition to apply to all versions of cmake on AIX?

w2yehia: can we loosen the condition to apply to all versions of cmake on AIX?
daltentyAuthorUnsubmitted
Done
ReplyInline Actions

Sure, this change shouldn't have a negative affect on older versions

daltenty: Sure, this change shouldn't have a negative affect on older versions
intrinsics_gen) set(LTO_LIBRARY_TYPE MODULE)
set(LTO_LIBRARY_NAME libLTO)
else()
set(LTO_LIBRARY_TYPE SHARED)
set(LTO_LIBRARY_NAME LTO)
endif()
w2yehiaUnsubmitted
Done
ReplyInline Actions

80 chars?

w2yehia: > 80 chars?
add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN
${SOURCES} DEPENDS intrinsics_gen)
install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h
DESTINATION include/llvm-c DESTINATION include/llvm-c
COMPONENT LTO) COMPONENT LTO)
if (APPLE) if (APPLE)
set(LTO_VERSION ${LLVM_VERSION_MAJOR}) set(LTO_VERSION ${LLVM_VERSION_MAJOR})
if(LLVM_LTO_VERSION_OFFSET) if(LLVM_LTO_VERSION_OFFSET)
math(EXPR LTO_VERSION "${LLVM_VERSION_MAJOR} + ${LLVM_LTO_VERSION_OFFSET}") math(EXPR LTO_VERSION "${LLVM_VERSION_MAJOR} + ${LLVM_LTO_VERSION_OFFSET}")
endif() endif()
set_property(TARGET LTO APPEND_STRING PROPERTY set_property(TARGET LTO APPEND_STRING PROPERTY
LINK_FLAGS LINK_FLAGS
" -compatibility_version 1 -current_version ${LTO_VERSION}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}") " -compatibility_version 1 -current_version ${LTO_VERSION}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
endif() endif()