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>

Fix a linker problem with ARM/thumb compatibility
a0940624 · Enrico Granata · Antonio Maiorano · 6aadd31a · a0940624
Commit a0940624 authored Sep 23, 2020 by Enrico Granata Committed by Antonio Maiorano Sep 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Android.bp third_party/marl/Android.bp +4 -1

No files found.
--- a/third_party/marl/Android.bp
+++ b/third_party/marl/Android.bp
@@ -34,7 +34,10 @@ cc_library_static {
        "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"], },