forked from boostorg/config
Update PGI C++ compiler support
When the PGI C++ compiler changed to be GNU compatible, pgi.hpp stopped being used, because the check for __GNUC__ in select_compiler_config.hpp was true before the preprocessor ever got to the check for __PGI. Rearrange the order of the checks in select_compiler_config.hpp, moving the check for __PGI above the check for __GNUC__. pgi.hpp was designed for a very old version of PGI C++, before it was GNU compatible. The settings in that file won't work for PGI compilers of the last few years. Replace the entire file with one that just includes gcc.hpp and then adjusts a few macros for areas where PGI is not quite GNU compatible. (The old PGI compilers are not actively being used by any customers that we (PGI) know of, so keeping the old contents of pgi.hpp would be of little or no benefit.)
This commit is contained in:
David Olsen
@ -1,4 +1,5 @@
|
|||||||
// (C) Copyright Noel Belcourt 2007.
|
// (C) Copyright Noel Belcourt 2007.
|
||||||
|
// Copyright 2017, NVIDIA CORPORATION.
|
||||||
// Use, modification and distribution are subject to the
|
// Use, modification and distribution are subject to the
|
||||||
// Boost Software License, Version 1.0. (See accompanying file
|
// Boost Software License, Version 1.0. (See accompanying file
|
||||||
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||||
@ -10,159 +11,13 @@
|
|||||||
#define BOOST_COMPILER_VERSION __PGIC__##__PGIC_MINOR__
|
#define BOOST_COMPILER_VERSION __PGIC__##__PGIC_MINOR__
|
||||||
#define BOOST_COMPILER "PGI compiler version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
|
#define BOOST_COMPILER "PGI compiler version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
|
||||||
|
|
||||||
//
|
// PGI is mostly GNU compatible. So start with that.
|
||||||
// Threading support:
|
#include <boost/config/compiler/gcc.hpp>
|
||||||
// Turn this on unconditionally here, it will get turned off again later
|
|
||||||
// if no threading API is detected.
|
|
||||||
//
|
|
||||||
|
|
||||||
#if __PGIC__ >= 11
|
// Now adjust for things that are different.
|
||||||
|
|
||||||
// options requested by configure --enable-test
|
// __float128 is a typedef, not a distinct type.
|
||||||
#define BOOST_HAS_PTHREADS
|
#undef BOOST_HAS_FLOAT128
|
||||||
#define BOOST_HAS_THREADS
|
|
||||||
#define BOOST_HAS_PTHREAD_YIELD
|
|
||||||
#define BOOST_HAS_NRVO
|
|
||||||
#define BOOST_HAS_LONG_LONG
|
|
||||||
|
|
||||||
// options --enable-test wants undefined
|
|
||||||
#undef BOOST_NO_STDC_NAMESPACE
|
|
||||||
#undef BOOST_NO_EXCEPTION_STD_NAMESPACE
|
|
||||||
#undef BOOST_DEDUCED_TYPENAME
|
|
||||||
|
|
||||||
#define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
|
|
||||||
#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
|
|
||||||
#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
|
|
||||||
#define BOOST_NO_CXX11_AUTO_DECLARATIONS
|
|
||||||
|
|
||||||
#elif __PGIC__ >= 10
|
|
||||||
|
|
||||||
// options requested by configure --enable-test
|
|
||||||
#define BOOST_HAS_THREADS
|
|
||||||
#define BOOST_HAS_NRVO
|
|
||||||
#define BOOST_HAS_LONG_LONG
|
|
||||||
#if defined(linux) || defined(__linux) || defined(__linux__)
|
|
||||||
# define BOOST_HAS_STDINT_H
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// options --enable-test wants undefined
|
|
||||||
#undef BOOST_NO_STDC_NAMESPACE
|
|
||||||
#undef BOOST_NO_EXCEPTION_STD_NAMESPACE
|
|
||||||
#undef BOOST_DEDUCED_TYPENAME
|
|
||||||
|
|
||||||
#elif __PGIC__ >= 7
|
|
||||||
|
|
||||||
#define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
|
|
||||||
#define BOOST_NO_TWO_PHASE_NAME_LOOKUP
|
|
||||||
#define BOOST_NO_SWPRINTF
|
|
||||||
#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
|
|
||||||
#define BOOST_NO_CXX11_AUTO_DECLARATIONS
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
# error "Pgi compiler not configured - please reconfigure"
|
|
||||||
|
|
||||||
#endif
|
|
||||||
//
|
|
||||||
// C++0x features
|
|
||||||
//
|
|
||||||
// See boost\config\suffix.hpp for BOOST_NO_LONG_LONG
|
|
||||||
//
|
|
||||||
#define BOOST_NO_CXX11_CHAR16_T
|
|
||||||
#define BOOST_NO_CXX11_CHAR32_T
|
|
||||||
#define BOOST_NO_CXX11_CONSTEXPR
|
|
||||||
#define BOOST_NO_CXX11_DECLTYPE
|
|
||||||
#define BOOST_NO_CXX11_DECLTYPE_N3276
|
|
||||||
#define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
|
|
||||||
#define BOOST_NO_CXX11_DELETED_FUNCTIONS
|
|
||||||
#define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
|
|
||||||
#define BOOST_NO_CXX11_EXTERN_TEMPLATE
|
|
||||||
#define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
|
|
||||||
#define BOOST_NO_CXX11_LAMBDAS
|
|
||||||
#define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
|
|
||||||
#define BOOST_NO_CXX11_NOEXCEPT
|
|
||||||
#define BOOST_NO_CXX11_NULLPTR
|
|
||||||
#define BOOST_NO_CXX11_NUMERIC_LIMITS
|
|
||||||
#define BOOST_NO_CXX11_RANGE_BASED_FOR
|
|
||||||
#define BOOST_NO_CXX11_RAW_LITERALS
|
|
||||||
#define BOOST_NO_CXX11_RVALUE_REFERENCES
|
|
||||||
#define BOOST_NO_CXX11_SCOPED_ENUMS
|
|
||||||
#define BOOST_NO_SFINAE_EXPR
|
|
||||||
#define BOOST_NO_CXX11_SFINAE_EXPR
|
|
||||||
#define BOOST_NO_CXX11_STATIC_ASSERT
|
|
||||||
#define BOOST_NO_SWPRINTF
|
|
||||||
#define BOOST_NO_CXX11_TEMPLATE_ALIASES
|
|
||||||
#define BOOST_NO_CXX11_UNICODE_LITERALS
|
|
||||||
#define BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
|
||||||
#define BOOST_NO_CXX11_VARIADIC_MACROS
|
|
||||||
#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
|
|
||||||
|
|
||||||
#define BOOST_NO_CXX11_HDR_UNORDERED_SET
|
|
||||||
#define BOOST_NO_CXX11_HDR_UNORDERED_MAP
|
|
||||||
#define BOOST_NO_CXX11_HDR_TYPEINDEX
|
|
||||||
#define BOOST_NO_CXX11_HDR_TYPE_TRAITS
|
|
||||||
#define BOOST_NO_CXX11_HDR_TUPLE
|
|
||||||
#define BOOST_NO_CXX11_HDR_THREAD
|
|
||||||
#define BOOST_NO_CXX11_HDR_SYSTEM_ERROR
|
|
||||||
#define BOOST_NO_CXX11_HDR_REGEX
|
|
||||||
#define BOOST_NO_CXX11_HDR_RATIO
|
|
||||||
#define BOOST_NO_CXX11_HDR_RANDOM
|
|
||||||
#define BOOST_NO_CXX11_HDR_MUTEX
|
|
||||||
#define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
|
|
||||||
#define BOOST_NO_CXX11_HDR_FUTURE
|
|
||||||
#define BOOST_NO_CXX11_HDR_FORWARD_LIST
|
|
||||||
#define BOOST_NO_CXX11_HDR_CONDITION_VARIABLE
|
|
||||||
#define BOOST_NO_CXX11_HDR_CODECVT
|
|
||||||
#define BOOST_NO_CXX11_HDR_CHRONO
|
|
||||||
#define BOOST_NO_CXX11_HDR_ARRAY
|
|
||||||
#define BOOST_NO_CXX11_USER_DEFINED_LITERALS
|
|
||||||
#define BOOST_NO_CXX11_ALIGNAS
|
|
||||||
#define BOOST_NO_CXX11_TRAILING_RESULT_TYPES
|
|
||||||
#define BOOST_NO_CXX11_INLINE_NAMESPACES
|
|
||||||
#define BOOST_NO_CXX11_REF_QUALIFIERS
|
|
||||||
#define BOOST_NO_CXX11_FINAL
|
|
||||||
#define BOOST_NO_CXX11_THREAD_LOCAL
|
|
||||||
|
|
||||||
// C++ 14:
|
|
||||||
#if !defined(__cpp_aggregate_nsdmi) || (__cpp_aggregate_nsdmi < 201304)
|
|
||||||
# define BOOST_NO_CXX14_AGGREGATE_NSDMI
|
|
||||||
#endif
|
|
||||||
#if !defined(__cpp_binary_literals) || (__cpp_binary_literals < 201304)
|
|
||||||
# define BOOST_NO_CXX14_BINARY_LITERALS
|
|
||||||
#endif
|
|
||||||
#if !defined(__cpp_constexpr) || (__cpp_constexpr < 201304)
|
|
||||||
# define BOOST_NO_CXX14_CONSTEXPR
|
|
||||||
#endif
|
|
||||||
#if !defined(__cpp_decltype_auto) || (__cpp_decltype_auto < 201304)
|
|
||||||
# define BOOST_NO_CXX14_DECLTYPE_AUTO
|
|
||||||
#endif
|
|
||||||
#if (__cplusplus < 201304) // There's no SD6 check for this....
|
|
||||||
# define BOOST_NO_CXX14_DIGIT_SEPARATORS
|
|
||||||
#endif
|
|
||||||
#if !defined(__cpp_generic_lambdas) || (__cpp_generic_lambdas < 201304)
|
|
||||||
# define BOOST_NO_CXX14_GENERIC_LAMBDAS
|
|
||||||
#endif
|
|
||||||
#if !defined(__cpp_init_captures) || (__cpp_init_captures < 201304)
|
|
||||||
# define BOOST_NO_CXX14_INITIALIZED_LAMBDA_CAPTURES
|
|
||||||
#endif
|
|
||||||
#if !defined(__cpp_return_type_deduction) || (__cpp_return_type_deduction < 201304)
|
|
||||||
# define BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION
|
|
||||||
#endif
|
|
||||||
#if !defined(__cpp_variable_templates) || (__cpp_variable_templates < 201304)
|
|
||||||
# define BOOST_NO_CXX14_VARIABLE_TEMPLATES
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// C++17
|
|
||||||
#if !defined(__cpp_structured_bindings) || (__cpp_structured_bindings < 201606)
|
|
||||||
# define BOOST_NO_CXX17_STRUCTURED_BINDINGS
|
|
||||||
#endif
|
|
||||||
#if !defined(__cpp_inline_variables) || (__cpp_inline_variables < 201606)
|
|
||||||
# define BOOST_NO_CXX17_INLINE_VARIABLES
|
|
||||||
#endif
|
|
||||||
#if !defined(__cpp_fold_expressions) || (__cpp_fold_expressions < 201603)
|
|
||||||
# define BOOST_NO_CXX17_FOLD_EXPRESSIONS
|
|
||||||
#endif
|
|
||||||
//
|
|
||||||
// version check:
|
|
||||||
// probably nothing to do here?
|
|
||||||
|
|
||||||
|
// __int128 is not supported.
|
||||||
|
#undef BOOST_HAS_INT128
|
||||||
|
|||||||
@ -52,6 +52,10 @@
|
|||||||
// Wind River Diab C++
|
// Wind River Diab C++
|
||||||
# define BOOST_COMPILER_CONFIG "boost/config/compiler/diab.hpp"
|
# define BOOST_COMPILER_CONFIG "boost/config/compiler/diab.hpp"
|
||||||
|
|
||||||
|
#elif defined(__PGI)
|
||||||
|
// Portland Group Inc.
|
||||||
|
# define BOOST_COMPILER_CONFIG "boost/config/compiler/pgi.hpp"
|
||||||
|
|
||||||
# elif defined(__GNUC__) && !defined(__ibmxl__)
|
# elif defined(__GNUC__) && !defined(__ibmxl__)
|
||||||
// GNU C++:
|
// GNU C++:
|
||||||
# define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc.hpp"
|
# define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc.hpp"
|
||||||
@ -108,10 +112,6 @@
|
|||||||
// IBM Visual Age or IBM XL C/C++ for Linux (Big Endian)
|
// IBM Visual Age or IBM XL C/C++ for Linux (Big Endian)
|
||||||
# define BOOST_COMPILER_CONFIG "boost/config/compiler/vacpp.hpp"
|
# define BOOST_COMPILER_CONFIG "boost/config/compiler/vacpp.hpp"
|
||||||
|
|
||||||
#elif defined(__PGI)
|
|
||||||
// Portland Group Inc.
|
|
||||||
# define BOOST_COMPILER_CONFIG "boost/config/compiler/pgi.hpp"
|
|
||||||
|
|
||||||
#elif defined _MSC_VER
|
#elif defined _MSC_VER
|
||||||
// Microsoft Visual C++
|
// Microsoft Visual C++
|
||||||
//
|
//
|
||||||
|
|||||||
Reference in New Issue
Block a user