RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 12:12:47 +01:00
Code Issues Projects Releases Wiki Activity

[tools][remarks-shlib] Don't build libRemarks.so without PIC

Browse Source 
A build on `sparcv9-sun-solaris2.11` with `-DLLVM_ENABLE_PIC=Off` failed
linking `libRemarks.so`:

  [27/2297] Linking CXX shared library lib/libRemarks.so.12git
  FAILED: lib/libRemarks.so.12git
  [...]
  ld: fatal: relocation error: R_SPARC_H44: file lib/libLLVMRemarks.a(Remark.cpp.o): symbol _ZTVN4llvm18raw_string_ostreamE: invalid shared object relocation type: ABS44 code model unsupported
  [...]

On Solaris/sparcv9 as on many other targets you cannot link non-PIC objects
into a shared object.

The following patch avoids this by not building the library with PIC.  It
allowed the build to complete and `ninja check-all` showed no errors.

Differential Revision: https://reviews.llvm.org/D85626
This commit is contained in:
Rainer Orth 2020-09-20 12:40:21 +02:00
parent acda854fa5
commit 4d957ca492
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tools/remarks-shlib/CMakeLists.txt
View File

@ -1,27 +1,32 @@
set(LLVM_LINK_COMPONENTS # Building shared libraries requires PIC objects.
Remarks if(LLVM_ENABLE_PIC)
)
set(SOURCES set(LLVM_LINK_COMPONENTS
libremarks.cpp Remarks
) )
set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Remarks.exports) set(SOURCES
libremarks.cpp
)
add_llvm_library(Remarks SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES}) set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Remarks.exports)
if (LLVM_INTEGRATED_CRT_ALLOC AND MSVC) add_llvm_library(Remarks SHARED INSTALL_WITH_TOOLCHAIN ${SOURCES})
# Make sure we search LLVMSupport first, before the CRT libs
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -INCLUDE:malloc") if (LLVM_INTEGRATED_CRT_ALLOC AND MSVC)
endif() # Make sure we search LLVMSupport first, before the CRT libs
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -INCLUDE:malloc")
endif()
install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h
DESTINATION include/llvm-c DESTINATION include/llvm-c
COMPONENT Remarks) COMPONENT Remarks)
if (APPLE)
set(REMARKS_VERSION ${LLVM_VERSION_MAJOR})
set_property(TARGET Remarks APPEND_STRING PROPERTY
LINK_FLAGS
" -compatibility_version 1 -current_version ${REMARKS_VERSION}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
endif()
if (APPLE)
set(REMARKS_VERSION ${LLVM_VERSION_MAJOR})
set_property(TARGET Remarks APPEND_STRING PROPERTY
LINK_FLAGS
" -compatibility_version 1 -current_version ${REMARKS_VERSION}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
endif() endif()