diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-16 17:01:35 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-16 17:01:35 +0000 |
commit | 6b776d9db25f5c9c0af1b1ebf4282b04dc1be261 (patch) | |
tree | 5bc02cea176f8685e8017572a1112d69bc122659 | |
parent | 12773b6ecad9970a29b60964b7780b19cb09da9f (diff) | |
parent | f1bb280542c90e98e3172d363abc2a450589f97b (diff) | |
download | bionic-6b776d9db25f5c9c0af1b1ebf4282b04dc1be261.tar.gz |
Merge "tlsdesc_resolver.S: use L() macro for local labels." into main
-rw-r--r-- | linker/arch/arm64/tlsdesc_resolver.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linker/arch/arm64/tlsdesc_resolver.S b/linker/arch/arm64/tlsdesc_resolver.S index ad155e288..84407ddbc 100644 --- a/linker/arch/arm64/tlsdesc_resolver.S +++ b/linker/arch/arm64/tlsdesc_resolver.S @@ -56,12 +56,12 @@ ENTRY_PRIVATE(tlsdesc_resolver_dynamic) ldr x22, [x0] // TlsDynamicResolverArg::generation cmp x21, x22 - b.lo .fallback + b.lo L(fallback) ldr x21, [x0, #8] // TlsIndex::module_id ldr x22, [x0, #16] // TlsIndex::offset ldr x21, [x20, x21, lsl #3] // TlsDtv::modules[module_id] - cbz x21, .fallback + cbz x21, L(fallback) add x0, x21, x22 sub x0, x0, x19 @@ -75,7 +75,7 @@ ENTRY_PRIVATE(tlsdesc_resolver_dynamic) .cfi_restore x20 ret -.fallback: +L(fallback): .cfi_restore_state ldp x21, x22, [sp, #16] .cfi_restore x21 |