Skip to content

Commit a1982f0

Browse files
authored
Merge pull request #4103 from jjhursey/config/v3.0.x/old-xl-ppc-support
config: Remove support for big endian PPC, XL compiler older than 13.1
2 parents f060434 + 9cfe7b3 commit a1982f0

File tree

3 files changed

+30
-10
lines changed

3 files changed

+30
-10
lines changed

NEWS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved.
1414
Use is subject to license terms.
1515
Copyright (c) 2006-2017 Los Alamos National Security, LLC. All rights
1616
reserved.
17-
Copyright (c) 2010-2012 IBM Corporation. All rights reserved.
17+
Copyright (c) 2010-2017 IBM Corporation. All rights reserved.
1818
Copyright (c) 2012 Oak Ridge National Labs. All rights reserved.
1919
Copyright (c) 2012-2017 Sandia National Laboratories. All rights reserved.
2020
Copyright (c) 2012 University of Houston. All rights reserved.
@@ -72,6 +72,8 @@ Removed legacy support:
7272
Open MPI BTL components for supported networks. Please see README for the currently
7373
available options.
7474
- Remove IB XRC support from the OpenIB BTL due to lack of support.
75+
- Remove support for big endian PowerPC.
76+
- Remove support for XL compilers older than v13.1
7577

7678
Known issues (to be addressed in v3.0.1):
7779

config/opal_check_vendor.m4

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
1313
dnl Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
1414
dnl Copyright (c) 2014 Intel, Inc. All rights reserved
15+
dnl Copyright (c) 2017 IBM Corporation. All rights reserved.
1516
dnl $COPYRIGHT$
1617
dnl
1718
dnl Additional copyrights may follow
@@ -114,6 +115,18 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [
114115
[OPAL_IF_IFELSE([defined(__FUJITSU)],
115116
[opal_check_compiler_vendor_result="fujitsu"])])
116117

118+
# IBM XL C/C++
119+
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
120+
[OPAL_IF_IFELSE([defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__)],
121+
[opal_check_compiler_vendor_result="ibm"
122+
xlc_major_version=`$CC -qversion 2>&1 | tail -n 1 | cut -d ' ' -f 2 | cut -d '.' -f 1`
123+
xlc_minor_version=`$CC -qversion 2>&1 | tail -n 1 | cut -d ' ' -f 2 | cut -d '.' -f 2`
124+
AS_IF([ (test "$xlc_major_version" -lt "13" ) || (test "$xlc_major_version" -eq "13" && test "$xlc_minor_version" -lt "1" )],
125+
[AC_MSG_ERROR(["XL Compiler versions less than 13.1 not supported. Detected $xlc_major_version.$xlc_minor_version"])])
126+
],
127+
[OPAL_IF_IFELSE([defined(_AIX) && !defined(__GNUC__)],
128+
[opal_check_compiler_vendor_result="ibm"])])])
129+
117130
# GNU
118131
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
119132
[OPAL_IFDEF_IFELSE([__GNUC__],
@@ -131,7 +144,7 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [
131144
AC_MSG_WARN([Detected gccfss being used to compile Open MPI.])
132145
AC_MSG_WARN([Because of several issues Open MPI does not support])
133146
AC_MSG_WARN([the gccfss compiler. Please use a different compiler.])
134-
AC_MSG_WARN([If you didn't think you used gccfss you may want to])
147+
AC_MSG_WARN([If you did not think you used gccfss you may want to])
135148
AC_MSG_WARN([check to see if the compiler you think you used is])
136149
AC_MSG_WARN([actually a link to gccfss.])
137150
AC_MSG_ERROR([Cannot continue])
@@ -181,13 +194,6 @@ AC_DEFUN([_OPAL_CHECK_COMPILER_VENDOR], [
181194
[OPAL_IF_IFELSE([defined(__HP_cc) || defined(__HP_aCC)],
182195
[opal_check_compiler_vendor_result="hp"])])
183196

184-
# IBM XL C/C++
185-
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
186-
[OPAL_IF_IFELSE([defined(__xlC__) || defined(__IBMC__) || defined(__IBMCPP__)],
187-
[opal_check_compiler_vendor_result="ibm"],
188-
[OPAL_IF_IFELSE([defined(_AIX) && !defined(__GNUC__)],
189-
[opal_check_compiler_vendor_result="ibm"])])])
190-
191197
# KAI C++ (rest in peace)
192198
AS_IF([test "$opal_check_compiler_vendor_result" = "unknown"],
193199
[OPAL_IFDEF_IFELSE([__KCC],

configure.ac

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
2323
# Copyright (c) 2014-2017 Research Organization for Information Science
2424
# and Technology (RIST). All rights reserved.
25-
# Copyright (c) 2016 IBM Corporation. All rights reserved.
25+
# Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
2626
# $COPYRIGHT$
2727
#
2828
# Additional copyrights may follow
@@ -84,6 +84,18 @@ AS_IF([test "$host" != "$target"],
8484
[AC_MSG_WARN([Cross-compile detected])
8585
AC_MSG_WARN([Cross-compiling is only partially supported])
8686
AC_MSG_WARN([Proceed at your own risk!])])
87+
# Check for architectures that we explicitly no longer support
88+
case "${host}" in
89+
powerpc-*|powerpc64-*|ppc-*)
90+
AC_MSG_ERROR([Big endian PPC is no longer supported.])
91+
;;
92+
esac
93+
case "${target}" in
94+
powerpc-*|powerpc64-*|ppc-*)
95+
AC_MSG_ERROR([Big endian PPC is no longer supported.])
96+
;;
97+
esac
98+
8799
# AC_USE_SYSTEM_EXTENSIONS alters CFLAGS (e.g., adds -g -O2)
88100
OPAL_VAR_SCOPE_PUSH([CFLAGS_save])
89101
CFLAGS_save=$CFLAGS

0 commit comments

Comments
 (0)