Skip to content

Commit 1b399fd

Browse files
brad0Debadri Basak
authored andcommitted
[OpenMP] Remove OS checks for ARM and AArch64 (llvm#165640)
1 parent ec662bc commit 1b399fd

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

openmp/runtime/src/z_Linux_asm.S

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@ KMP_PREFIX_UNDERSCORE(\proc):
121121
# endif // KMP_OS_DARWIN
122122
#endif // KMP_ARCH_X86 || KMP_ARCH_x86_64
123123

124-
#if (KMP_OS_LINUX || KMP_OS_DARWIN || KMP_OS_WINDOWS || KMP_OS_OPENBSD) && \
125-
(KMP_ARCH_AARCH64 || KMP_ARCH_AARCH64_32 || KMP_ARCH_ARM)
124+
#if KMP_ARCH_AARCH64 || KMP_ARCH_AARCH64_32 || KMP_ARCH_ARM
126125

127126
# if KMP_OS_DARWIN
128127
# define KMP_PREFIX_UNDERSCORE(x) _##x // extra underscore for OS X* symbols
@@ -237,8 +236,7 @@ KMP_PREFIX_UNDERSCORE(\proc):
237236
# define PACBTI_RET
238237
# define GNU_PROPERTY_BTI_PAC
239238
# endif
240-
#endif // (KMP_OS_LINUX || KMP_OS_DARWIN || KMP_OS_WINDOWS || KMP_OS_OPENBSD) && \
241-
(KMP_ARCH_AARCH64 || KMP_ARCH_AARCH64_32 || KMP_ARCH_ARM)
239+
#endif // KMP_ARCH_AARCH64 || KMP_ARCH_AARCH64_32 || KMP_ARCH_ARM
242240

243241
.macro COMMON name, size, align_power
244242
#if KMP_OS_DARWIN
@@ -1302,7 +1300,7 @@ KMP_LABEL(kmp_no_args):
13021300
#endif /* KMP_ARCH_X86_64 */
13031301

13041302
// '
1305-
#if (KMP_OS_LINUX || KMP_OS_DARWIN || KMP_OS_WINDOWS) && (KMP_ARCH_AARCH64 || KMP_ARCH_AARCH64_32)
1303+
#if KMP_ARCH_AARCH64 || KMP_ARCH_AARCH64_32
13061304

13071305
//------------------------------------------------------------------------
13081306
// int
@@ -1428,9 +1426,9 @@ KMP_LABEL(kmp_1):
14281426
DEBUG_INFO __kmp_invoke_microtask
14291427
// -- End __kmp_invoke_microtask
14301428

1431-
#endif /* (KMP_OS_LINUX || KMP_OS_DARWIN || KMP_OS_WINDOWS) && (KMP_ARCH_AARCH64 || KMP_ARCH_AARCH64_32) */
1429+
#endif /* KMP_ARCH_AARCH64 || KMP_ARCH_AARCH64_32 */
14321430

1433-
#if (KMP_OS_LINUX || KMP_OS_DARWIN || KMP_OS_WINDOWS) && KMP_ARCH_ARM
1431+
#if KMP_ARCH_ARM
14341432

14351433
//------------------------------------------------------------------------
14361434
// int
@@ -1573,7 +1571,7 @@ KMP_LABEL(kmp_1):
15731571
DEBUG_INFO __kmp_invoke_microtask
15741572
// -- End __kmp_invoke_microtask
15751573

1576-
#endif /* (KMP_OS_LINUX || KMP_OS_DARWIN || KMP_OS_WINDOWS) && KMP_ARCH_ARM */
1574+
#endif /* KMP_ARCH_ARM */
15771575

15781576
#if KMP_ARCH_PPC64
15791577

openmp/runtime/src/z_Linux_util.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2736,8 +2736,7 @@ int __kmp_get_load_balance(int max) {
27362736

27372737
#endif // USE_LOAD_BALANCE
27382738

2739-
#if !(KMP_ARCH_X86 || KMP_ARCH_X86_64 || KMP_MIC || \
2740-
((KMP_OS_LINUX || KMP_OS_DARWIN) && KMP_ARCH_AARCH64) || \
2739+
#if !(KMP_ARCH_X86 || KMP_ARCH_X86_64 || KMP_MIC || KMP_ARCH_AARCH64 || \
27412740
KMP_ARCH_PPC64 || KMP_ARCH_RISCV64 || KMP_ARCH_LOONGARCH64 || \
27422741
KMP_ARCH_ARM || KMP_ARCH_VE || KMP_ARCH_S390X || KMP_ARCH_PPC_XCOFF || \
27432742
KMP_ARCH_AARCH64_32)

0 commit comments

Comments
 (0)