caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[OpenMP] Fix __kmp_unnamed_critical_addr .type setting (#138815)

Browse Source 
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`.
This commit is contained in:
Rainer Orth
2025-05-07 20:59:42 +02:00
committed by GitHub
parent 854b9e9317
commit 39beeb8eaa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openmp/runtime/src/z_Linux_asm.S
View File

@@ -2482,7 +2482,7 @@ __kmp_invoke_microtask:
KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr): KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr):
.4byte .gomp_critical_user_ .4byte .gomp_critical_user_
#ifdef __ELF__ #ifdef __ELF__
.type KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),@object .type KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),%object
.size KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),4 .size KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),4
#endif #endif
#endif /* KMP_ARCH_ARM || KMP_ARCH_MIPS || KMP_ARCH_AARCH64_32 || KMP_ARCH_SPARC32 */ #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):
KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr): KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr):
.8byte .gomp_critical_user_ .8byte .gomp_critical_user_
#ifdef __ELF__ #ifdef __ELF__
.type KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),@object .type KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),%object
.size KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),8 .size KMP_PREFIX_UNDERSCORE(__kmp_unnamed_critical_addr),8
#endif #endif
#endif /* KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 || KMP_ARCH_MIPS64 || #endif /* KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 || KMP_ARCH_MIPS64 ||