Skip to content

Commit 6d7a4d3

Browse files
committed
Fix check for IBM xl compilers for v13.1 and later.
By default newer xlc compilers only define __ibmxl__ now. https://www.ibm.com/support/knowledgecenter/en/SSXVZZ_13.1.6/com.ibm.xlcpp1316.lelinux.doc/compiler_ref/xlmacros.html Signed-off-by: Austen Lauria <[email protected]>
1 parent 09dfb12 commit 6d7a4d3

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

config/opal_check_vendor.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [
123123

124124
# IBM XL C/C++
125125
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
126-
[OPAL_IF_IFELSE([defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__)],
126+
[OPAL_IF_IFELSE([defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__) || defined(__ibmxl__)],
127127
[opal_check_compiler_vendor_result="ibm"
128128
xlc_major_version=`$CC -qversion 2>&1 | tail -n 1 | cut -d ' ' -f 2 | cut -d '.' -f 1`
129129
xlc_minor_version=`$CC -qversion 2>&1 | tail -n 1 | cut -d ' ' -f 2 | cut -d '.' -f 2`

opal/include/opal/opal_portable_platform.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
172172
# endif
173173

174-
#elif defined(__xlC__)
174+
#elif defined(__xlC__) || defined(__ibmxl__) || defined(__IBMC__) || defined(__IBMCPP__)
175175
# define PLATFORM_COMPILER_XLC 1
176176
# define PLATFORM_COMPILER_FAMILYNAME XLC
177177
# define PLATFORM_COMPILER_FAMILYID 5

opal/include/opal/sys/powerpc/atomic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void opal_atomic_isync(void)
107107
*********************************************************************/
108108
#if OPAL_GCC_INLINE_ASSEMBLY
109109

110-
#ifdef __xlC__
110+
#if defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__) || defined(__ibmxl__)
111111
/* work-around bizzare xlc bug in which it sign-extends
112112
a pointer to a 32-bit signed integer */
113113
#define OPAL_ASM_ADDR(a) ((uintptr_t)a)

0 commit comments

Comments
 (0)