| Message ID | yddv8k0xxqx.fsf@CeBiTec.Uni-Bielefeld.DE |
|---|---|
| State | New |
| Headers | show |
| Series | [COMMITTED] fixincludes: Bypass solaris_math_12 on newer Solaris 11.4 | expand |
# HG changeset patch # Parent 76f1a1965f9296be97f6edc2b9610d6600036de1 fixincludes: Bypass solaris_math_12 on newer Solaris 11.4 diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def --- 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
Solaris 11 <math.h> long had this snippet #if __cplusplus >= 201103L #undef _GLIBCXX_USE_C99_MATH #undef _GLIBCXX_USE_C99_MATH_TR1 #endif 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 */ #if (__cplusplus >= 201103L) && \ ((__SUNPRO_CC == 0x5130) || (__SUNPRO_CC == 0x5140) || \ defined(__MATH_PREEMPTS_GLIBCXX_C99_MATH)) #ifdef _GLIBCXX_USE_C99_MATH #undef _GLIBCXX_USE_C99_MATH #endif #ifdef _GLIBCXX_USE_C99_MATH_TR1 #undef _GLIBCXX_USE_C99_MATH_TR1 #endif #endif 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). Committed to trunk. I may backport to the gcc-11 and gcc-12 branches, too. Rainer