diff options
| author | Mauro Rossi <[email protected]> | 2019-07-14 10:53:19 +0200 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-09-24 08:25:27 -0700 |
| commit | ba8b282ae49abebaa7242ab0bd8a061dcfea5c31 (patch) | |
| tree | b80826a453cd1b809b4676aff773b156933b8690 /Android.mk | |
| parent | f7e25ae6d6ff2eb16e076a1a9052631d1a13997b (diff) | |
android: mesa: revert "Enable asm unconditionally"
This patch partially reverts 20294dc ("mesa: Enable asm unconditionally, ...")
Android makefile build logic needs to disable assembler optimization
in 32bit builds to avoid text relocations for libglapi.so shared
Fixes the following build error with Android x86 32bit target:
[ 0% 4/477] target SharedLib: libglapi (out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so)
FAILED: out/target/product/x86/obj/SHARED_LIBRARIES/libglapi_intermediates/LINKED/libglapi.so
...
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld: warning: shared library text segment is not shareable
prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/x86_64-linux-android/bin/ld: error: treating warnings as errors
clang-6.0: error: linker command failed with exit code 1 (use -v to see invocation)
Fixes: 20294dc ("mesa: Enable asm unconditionally, now that gen_matypes is gone.")
Signed-off-by: Mauro Rossi <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
(cherry picked from commit 7a6e7803a791724841346b4b274ce68bcf3fff3f)
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 76d26f9bd83..e86c9bd510a 100644 --- a/Android.mk +++ b/Android.mk @@ -83,6 +83,13 @@ endif $(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true)) +# host and target must be the same arch to generate matypes.h +ifeq ($(TARGET_ARCH),$(HOST_ARCH)) +MESA_ENABLE_ASM := true +else +MESA_ENABLE_ASM := false +endif + ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),) MESA_ENABLE_LLVM := true endif |