commit a09406249fa35754129856e6eba2ab9a8dae88d5
author Enrico Granata <egranata@google.com> Wed Sep 23 15:34:24 2020 -0600
committer Antonio Maiorano <amaiorano@google.com> Thu Sep 24 00:45:37 2020 +0000
tree d87ae1d465f17242614b921dd4cae40bd1b94395
parent 6aadd31a5f988b254046addce6aadaa650f098e9

Fix a linker problem with ARM/thumb compatibility

Trying to build trout_arm64 on git_master results in linker errors
due to certain library symbols not supporting branch and link relocation

Apply the fix used elsewhere in the codebase (e.g. ag/12429028) to
overcome this issue

Bug: b/155835175
Test: build trout_arm64-userdebug
Change-Id: Ib83fae561f50dbe3080bd3018690844efebe67df
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/48648
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>

third_party/marl/Android.bp

diff --git a/third_party/marl/Android.bp b/third_party/marl/Android.bp
index 1c0cef8..fab2122 100644
--- a/third_party/marl/Android.bp
+++ b/third_party/marl/Android.bp
@@ -34,7 +34,10 @@
         "external/swiftshader/third_party/marl/include"
     ],
     arch: {
-        arm: { srcs: ["src/osfiber_arm.c", "src/osfiber_asm_arm.S"], },
+        arm: {
+            instruction_set: "arm",
+            srcs: ["src/osfiber_arm.c", "src/osfiber_asm_arm.S"],
+        },
         arm64: { srcs: ["src/osfiber_aarch64.c", "src/osfiber_asm_aarch64.S"], },
         x86: { srcs: ["src/osfiber_x86.c", "src/osfiber_asm_x86.S"], },
         x86_64: { srcs: ["src/osfiber_x64.c", "src/osfiber_asm_x64.S"], },