Skip to content

Commit 39beeb8

Browse files
authored
[OpenMP] Fix __kmp_unnamed_critical_addr .type setting (#138815)
PR #138517 broke the Android LLVM builders: ARM doesn't understand the `@object` form. As it turns out, one can use `%object` instead, which does assemble on all targets currently supported by `z_Linux_asm.S`. Tested by rebuilding `libomp.so` on `sparcv9-sun-solaris2.11`.
1 parent 854b9e9 commit 39beeb8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

openmp/runtime/src/z_Linux_asm.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2482,7 +2482,7 @@ __kmp_invoke_microtask:
24822482
KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr):
24832483
.4byte .gomp_critical_user_
24842484
#ifdef __ELF__
2485-
.type KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),@object
2485+
.type KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),%object
24862486
.size KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),4
24872487
#endif
24882488
#endif /* KMP_ARCH_ARM || KMP_ARCH_MIPS || KMP_ARCH_AARCH64_32 || KMP_ARCH_SPARC32 */
@@ -2501,7 +2501,7 @@ KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr):
25012501
KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr):
25022502
.8byte .gomp_critical_user_
25032503
#ifdef __ELF__
2504-
.type KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),@object
2504+
.type KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),%object
25052505
.size KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),8
25062506
#endif
25072507
#endif /* KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 || KMP_ARCH_MIPS64 ||

0 commit comments

Comments
 (0)