diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2023-02-17 13:48:45 +0100 |
|---|---|---|
| committer | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2023-02-17 13:48:45 +0100 |
| commit | 593c8b73fb15683fdd1a9d85fe7e7e99540de3c8 (patch) | |
| tree | 6cefce0a858e525001822e3a8fcc26e4ab03b3e2 /fixincludes/inclhack.def | |
| parent | ae2c1d0a9dc33f4c309a589d9f68fcd31206500e (diff) | |
| download | gcc-593c8b73fb15683fdd1a9d85fe7e7e99540de3c8.zip gcc-593c8b73fb15683fdd1a9d85fe7e7e99540de3c8.tar.gz gcc-593c8b73fb15683fdd1a9d85fe7e7e99540de3c8.tar.bz2 | |
fixincludes: Bypass solaris_math_12 on newer Solaris 11.4
Solaris 11 <math.h> long had this snippet
which badly broke libstdc++. This has long been undone using
fixincludes in
[fixincludes, v3] Don't define libstdc++-internal macros in Solaris 10+ <math.h>
https://gcc.gnu.org/ml/gcc-patches/2016-11/msg00330.html
However, the issue came up again recently when that code broke the LLVM
build, too, which unfortunately doesn't know about GCC's include-fixed
directory. The issue was reinvestigated and it turned out that the
workaround/hack is only needed for specific old versions of the Sun/Oracle
Studio compilers. So <math.h> now looks like
/* Accommodate historical C++11 -std=c++03 behavior of Studio 12.4 and 12.5 */
((__SUNPRO_CC == 0x5130) || (__SUNPRO_CC == 0x5140) || \
defined(__MATH_PREEMPTS_GLIBCXX_C99_MATH))
If this change is in place, there's no longer a need for the fixincludes
fix, so this patch bypasses it as appropriate.
Tested on Solaris 11.3 (without the fixed header) and recent 11.4 (with
the fixed header).
2022-11-01 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
fixincludes:
* inclhack.def (solaris_math_12): Add bypass.
* fixincl.x: Regenerate.
Diffstat (limited to 'fixincludes/inclhack.def')
| -rw-r--r-- | fixincludes/inclhack.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index b02dd8e..45e0cbc 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -4306,6 +4306,7 @@ fix = { files = math.h; mach = '*-*-solaris2*'; select = '#undef.*_GLIBCXX_USE_C99_MATH'; + bypass = '__MATH_PREEMPTS_GLIBCXX_C99_MATH'; sed = "/#undef[ \t]*_GLIBCXX_USE_C99_MATH/d"; test_text = << _EOText_ #if __cplusplus >= 201103L |