diff options
| author | Mauro Rossi <issor.oruam@gmail.com> | 2019-07-14 10:53:19 +0200 |
|---|---|---|
| committer | Mauro Rossi <issor.oruam@gmail.com> | 2019-09-06 08:48:28 +0200 |
| commit | 7a6e7803a791724841346b4b274ce68bcf3fff3f (patch) | |
| tree | 8d4084d8b121673d614582d409e4697657949431 /Android.common.mk | |
| parent | fa13b2f00214cbbf8d5cac05f5ffe7410f8f85a3 (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 <issor.oruam@gmail.com>
Acked-by: Eric Engestrom <eric@engestrom.ch>
Diffstat (limited to 'Android.common.mk')
| -rw-r--r-- | Android.common.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.common.mk b/Android.common.mk index 825b60381d0..327f13f5a38 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -103,9 +103,12 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo true),true) LOCAL_CFLAGS += -DHAVE_SYS_SHM_H endif +ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += \ -DUSE_X86_ASM + +endif endif ifeq ($(ARCH_ARM_HAVE_NEON),true) LOCAL_CFLAGS_arm += -DUSE_ARM_ASM |