This is an archive of the discontinued LLVM Phabricator instance.

Differential D140268

[CMake] Make libLLVM functionable for Android
ClosedPublic

Authored by e-kud on Dec 17 2022, 6:07 PM.

Details

Reviewers
xbolva00
Commits
rG4bb635f90c9e: [CMake] Make libLLVM functionable for Android
Summary

libLLVM.so is empty if it is built with Android NDK (-DLLVM_BUILD_LLVM_DYLIB=ON). The patch fixes it.

Diff Detail

Event Timeline

e-kud created this revision.Dec 17 2022, 6:07 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 17 2022, 6:07 PM
Herald added a subscriber: danielkiss. · View Herald Transcript
e-kud edited the summary of this revision. (Show Details)Dec 17 2022, 6:10 PM
e-kud edited the summary of this revision. (Show Details)
Harbormaster completed remote builds in B203789: Diff 483795.Dec 17 2022, 8:07 PM
e-kud published this revision for review.Dec 18 2022, 2:53 PM
e-kud added a reviewer: xbolva00.
Herald added a project: Restricted Project. · View Herald TranscriptDec 18 2022, 2:53 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
xbolva00 accepted this revision.Dec 18 2022, 2:55 PM

LG

This revision is now accepted and ready to land.Dec 18 2022, 2:55 PM
This revision was landed with ongoing or failed builds.Jan 10 2023, 6:19 PM
Closed by commit rG4bb635f90c9e: [CMake] Make libLLVM functionable for Android (authored by e-kud, committed by pengfei). · Explain Why
This revision was automatically updated to reflect the committed changes.
pengfei added a commit: rG4bb635f90c9e: [CMake] Make libLLVM functionable for Android.

Revision Contents

PathSize
llvm/
tools/
llvm-shlib/
1 line

Diff 488052

llvm/tools/llvm-shlib/CMakeLists.txt

Show All 33 Linesif(LLVM_BUILD_LLVM_DYLIB)
list(REMOVE_DUPLICATES LIB_NAMES) list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "GNU") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "GNU")
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")) # FIXME: It should be "GNU ld for elf" OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")) # FIXME: It should be "GNU ld for elf"
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in ${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in
${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map) ${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map)
# GNU ld doesn't resolve symbols in the version script. # GNU ld doesn't resolve symbols in the version script.
set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive) set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
if (NOT LLVM_LINKER_IS_SOLARISLD AND NOT MINGW) if (NOT LLVM_LINKER_IS_SOLARISLD AND NOT MINGW)
▲ Show 20 Lines • Show All 146 Lines • Show Last 20 Lines