android: mesa: revert "Enable asm unconditionally"
authorMauro Rossi <issor.oruam@gmail.com>
Sun, 14 Jul 2019 08:53:19 +0000 (10:53 +0200)
committerMauro Rossi <issor.oruam@gmail.com>
Fri, 6 Sep 2019 06:48:28 +0000 (08:48 +0200)
commit7a6e7803a791724841346b4b274ce68bcf3fff3f
tree8d4084d8b121673d614582d409e4697657949431
parentfa13b2f00214cbbf8d5cac05f5ffe7410f8f85a3
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>
Android.common.mk
Android.mk
src/mesa/Android.libmesa_dricore.mk
src/mesa/Android.libmesa_st_mesa.mk