commit b7c04b1790fb69e2f0f942a286c76b3efef85eab
author Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Mon Aug 10 10:16:39 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Mon Aug 17 10:47:41 2020 +0000
tree df5b972d2453982031524dba7743a9dcd5c65b86
parent 916110e17f2e04d685978e6b385b3fe0d3231fe9

ac/llvm: handle static/shared llvm init separately

Having a single init function works as expected for shared llvm, but
when using a static llvm only one llvm will get initialized.

This commit introduces 2 separate init function:
- shared llvm = single public init function
- static llvm = one init function for each module using llvm

Fixes: 50d20dc055d ("ac/llvm: export ac_init_llvm_once in targets")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3376
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6253>

Android.mk

diff --git a/Android.mk b/Android.mk
index 6181bbe8..aa2e7f7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -97,7 +97,7 @@
 define mesa-build-with-llvm
   $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5 6 7), \
     $(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \
-  $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DMESA_LLVM_VERSION_STRING=\"3.9\") \
+  $(eval LOCAL_CFLAGS += -DLLVM_AVAILABLE -DLLVM_IS_SHARED=1 -DMESA_LLVM_VERSION_STRING=\"3.9\") \
   $(eval LOCAL_SHARED_LIBRARIES += libLLVM)
 endef