From c3299cde4f33121f82a7a25d10c152ac96d2b035 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Wed, 2 Nov 2022 10:52:59 +0100 Subject: [PATCH] builtins: Guard builtins.cc against HUGE_VAL and NAN definitions trunk bootstrap recently broke on Solaris like this: /vol/gcc/src/hg/master/local/gcc/builtins.cc:2104:8: error: pasting "CFN_BUILT_IN_" and "(" does not give a valid preprocessing token 2104 | case CFN_BUILT_IN_##MATHFN: \ | ^~~~~~~~~~~~~ /vol/gcc/src/hg/master/local/gcc/builtins.cc:2112:3: note: in expansion of macro 'CASE_MATHFN' 2112 | CASE_MATHFN(MATHFN) \ | ^~~~~~~~~~~ /vol/gcc/src/hg/master/local/gcc/builtins.cc:1967:5: note: in expansion of macro 'CASE_MATHFN_FLOATN' 1967 | CASE_MATHFN_FLOATN (HUGE_VAL) \ and similarly for NAN. It turns out this happens because is included at some point, which (in ) defines While this only happpens on Solaris right now, the same issue would be present on other targets when gets included somehow. To avoid this, this patch #undef's both macros. Bootstrapped without regressions on i386-pc-solaris2.11 and sparc-sun-solaris2.11. 2022-11-01 Rainer Orth gcc: * builtins.cc (mathfn_built_in_2): #undef HUGE_VAL, NAN. --- gcc/builtins.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gcc/builtins.cc b/gcc/builtins.cc index b359ce2fcede..4dc1ca672b23 100644 --- a/gcc/builtins.cc +++ b/gcc/builtins.cc @@ -1931,6 +1931,11 @@ mathfn_built_in_2 (tree type, combined_fn fn) built_in_function fcodef64x = END_BUILTINS; built_in_function fcodef128x = END_BUILTINS; + /* If has been included somehow, HUGE_VAL and NAN definitions + break the uses below. */ +#undef HUGE_VAL +#undef NAN + switch (fn) { #define SEQ_OF_CASE_MATHFN \ -- 2.47.2