Skip to content
Snippets Groups Projects
Commit ba8b282a authored by maurossi's avatar maurossi Committed by Dylan Baker
Browse files

android: mesa: revert "Enable asm unconditionally"


This patch partially reverts 20294dce ("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: 20294dce ("mesa: Enable asm unconditionally, now that gen_matypes is gone.")
Signed-off-by: default avatarMauro Rossi <issor.oruam@gmail.com>
Acked-by: Eric Engestrom's avatarEric Engestrom <eric@engestrom.ch>
(cherry picked from commit 7a6e7803)
parent f7e25ae6
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment