Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-llvm: Commit

external/llvm


Commit MetaInfo

Revision7d0a0e421b80459b4b56e381e46bd53043b9139c (tree)
Time2017-04-26 11:22:34
AuthorMauro Rossi <issor.oruam@gmai...>
CommiterChih-Wei Huang

Log Message

android: enable swrast w/o radeonsi build

There has been a cross dependency between swrast and radeonsi builds,
as gallium/auxiliary requires that libLLVM provides the symbols in
libLLVMExecutionEngine, libLLVMRuntimeDyld and libLLVMMCJIT

In order to avoid having to enable radeonsi to properly build swast,
libLLVMExecutionEngine, libLLVMRuntimeDyld and libLLVMMCJIT
are added to device libLLVM as whole static dependecies.

For simplification these common dependencies are set as unconditional
and llvm_device_static_libraries is used to keep existing code style.

libAMDGPU* dependencies are now defined as strictly radeonsi conditional.

Change Summary

Incremental Difference

--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -34,10 +34,7 @@ llvm_x86_static_libraries += \
3434 libLLVMAMDGPUDesc \
3535 libLLVMAMDGPUAsmParser \
3636 libLLVMAMDGPUAsmPrinter \
37- libLLVMAMDGPUUtils \
38- libLLVMExecutionEngine \
39- libLLVMMCJIT \
40- libLLVMRuntimeDyld
37+ libLLVMAMDGPUUtils
4138 endif
4239
4340 llvm_mips_static_libraries := \
@@ -86,6 +83,11 @@ llvm_host_static_libraries := \
8683 libLLVMMCJIT \
8784 libLLVMOrcJIT
8885
86+llvm_device_static_libraries := \
87+ libLLVMExecutionEngine \
88+ libLLVMRuntimeDyld \
89+ libLLVMMCJIT
90+
8991 # HOST LLVM shared library build
9092 include $(CLEAR_VARS)
9193 LOCAL_IS_HOST_MODULE := true
@@ -150,7 +152,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_arm_static_libraries)
150152 LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_aarch64_static_libraries)
151153 endif
152154
153-LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)
155+LOCAL_WHOLE_STATIC_LIBRARIES += \
156+ $(llvm_device_static_libraries) \
157+ $(llvm_post_static_libraries)
154158
155159 include $(LLVM_DEVICE_BUILD_MK)
156160 include $(BUILD_SHARED_LIBRARY)
Show on old repository browser