1From 19dee009e7626d2e00d74e5258098f26512583be Mon Sep 17 00:00:00 2001 2From: Joseph Myers <joseph@codesourcery.com> 3Date: Tue, 17 Mar 2020 22:57:42 +0000 4Subject: [PATCH 07/20] Fix build with GCC 10 when long double = double. 5 6On platforms where long double has the same ABI as double, glibc 7defines long double functions as aliases for the corresponding double 8functions. The declarations of those functions in <math.h> are 9disabled to avoid problems with aliases having incompatible types, but 10GCC 10 now gives errors for incompatible types when the long double 11function is known to GCC as a built-in function, not just when there 12is an incompatible header declaration. 13 14This patch fixes those errors by using appropriate 15-fno-builtin-<function> options to compile the double functions. The 16list of CFLAGS-* settings is an appropriately adapted version of that 17in sysdeps/ieee754/ldbl-opt/Makefile used there for building nldbl-*.c 18files; in particular, the options are used even if GCC does not 19currently have a built-in function of a given function, so that adding 20such a built-in function in future will not break the glibc build. 21Thus, various of the CFLAGS-* settings are only for future-proofing 22and may not currently be needed (and it's possible some could be 23irrelevant for other reasons). 24 25Tested with build-many-glibcs.py for arm-linux-gnueabi (compilers and 26glibcs builds), where it fixes the build that previously failed. 27 28(cherry picked from commit 49348beafe9ba150c9bd48595b3f372299bddbb0) 29Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 30--- 31 math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++ 32 1 file changed, 122 insertions(+) 33 34diff --git a/math/Makefile b/math/Makefile 35index 90b3b689..b598db37 100644 36--- a/math/Makefile 37+++ b/math/Makefile 38@@ -664,6 +664,128 @@ ifneq ($(long-double-fcts),yes) 39 # We won't compile the `long double' code at all. Tell the `double' code 40 # to define aliases for the `FUNCl' names. 41 math-CPPFLAGS += -DNO_LONG_DOUBLE 42+# GCC 10 diagnoses aliases with types conflicting with built-in 43+# functions. 44+CFLAGS-w_acos.c += -fno-builtin-acosl 45+CFLAGS-w_acosh.c += -fno-builtin-acoshl 46+CFLAGS-w_asin.c += -fno-builtin-asinl 47+CFLAGS-s_asinh.c += -fno-builtin-asinhl 48+CFLAGS-s_atan.c += -fno-builtin-atanl 49+CFLAGS-w_atan2.c += -fno-builtin-atan2l 50+CFLAGS-w_atanh.c += -fno-builtin-atanhl 51+CFLAGS-s_cabs.c += -fno-builtin-cabsl 52+CFLAGS-s_cacos.c += -fno-builtin-cacosl 53+CFLAGS-s_cacosh.c += -fno-builtin-cacoshl 54+CFLAGS-s_canonicalize.c += -fno-builtin-canonicalizel 55+CFLAGS-s_carg.c += -fno-builtin-cargl 56+CFLAGS-s_casin.c += -fno-builtin-casinl 57+CFLAGS-s_casinh.c += -fno-builtin-casinhl 58+CFLAGS-s_catan.c += -fno-builtin-catanl 59+CFLAGS-s_catanh.c += -fno-builtin-catanhl 60+CFLAGS-s_cbrt.c += -fno-builtin-cbrtl 61+CFLAGS-s_ccos.c += -fno-builtin-ccosl 62+CFLAGS-s_ccosh.c += -fno-builtin-ccoshl 63+CFLAGS-s_ceil.c += -fno-builtin-ceill 64+CFLAGS-s_cexp.c += -fno-builtin-cexpl 65+CFLAGS-s_cimag.c += -fno-builtin-cimagl 66+CFLAGS-s_clog.c += -fno-builtin-clogl 67+CFLAGS-s_clog10.c += -fno-builtin-clog10l 68+CFLAGS-s_conj.c += -fno-builtin-conjl 69+CFLAGS-s_copysign.c += -fno-builtin-copysignl 70+CFLAGS-s_cos.c += -fno-builtin-cosl 71+CFLAGS-w_cosh.c += -fno-builtin-coshl 72+CFLAGS-s_cpow.c += -fno-builtin-cpowl 73+CFLAGS-s_cproj.c += -fno-builtin-cprojl 74+CFLAGS-s_creal.c += -fno-builtin-creall 75+CFLAGS-s_csin.c += -fno-builtin-csinl 76+CFLAGS-s_csinh.c += -fno-builtin-csinhl 77+CFLAGS-s_csqrt.c += -fno-builtin-csqrtl 78+CFLAGS-s_ctan.c += -fno-builtin-ctanl 79+CFLAGS-s_ctanh.c += -fno-builtin-ctanhl 80+CFLAGS-s_dadd.c += -fno-builtin-daddl 81+CFLAGS-s_ddiv.c += -fno-builtin-ddivl 82+CFLAGS-s_dmul.c += -fno-builtin-dmull 83+CFLAGS-s_dsub.c += -fno-builtin-dsubl 84+CFLAGS-s_erf.c += -fno-builtin-erfl 85+CFLAGS-s_erfc.c += -fno-builtin-erfcl 86+CFLAGS-e_exp.c += -fno-builtin-expl 87+CFLAGS-w_exp10.c += -fno-builtin-exp10l 88+CFLAGS-e_exp2.c += -fno-builtin-exp2l 89+CFLAGS-s_expm1.c += -fno-builtin-expm1l 90+CFLAGS-s_fabs.c += -fno-builtin-fabsl 91+CFLAGS-s_fadd.c += -fno-builtin-faddl 92+CFLAGS-s_fdim.c += -fno-builtin-fdiml 93+CFLAGS-s_fdiv.c += -fno-builtin-fdivl 94+CFLAGS-s_finite.c += -fno-builtin-finitel 95+CFLAGS-s_floor.c += -fno-builtin-floorl 96+CFLAGS-s_fma.c += -fno-builtin-fmal 97+CFLAGS-s_fmax.c += -fno-builtin-fmaxl 98+CFLAGS-s_fmaxmag.c += -fno-builtin-fmaxmagl 99+CFLAGS-s_fmin.c += -fno-builtin-fminl 100+CFLAGS-s_fminmag.c += -fno-builtin-fminmagl 101+CFLAGS-w_fmod.c += -fno-builtin-fmodl 102+CFLAGS-s_fmul.c += -fno-builtin-fmull 103+CFLAGS-s_frexp.c += -fno-builtin-frexpl 104+CFLAGS-s_fromfp.c += -fno-builtin-fromfpl 105+CFLAGS-s_fromfpx.c += -fno-builtin-fromfpxl 106+CFLAGS-s_fsub.c += -fno-builtin-fsubl 107+CFLAGS-s_gamma.c += -fno-builtin-gammal 108+CFLAGS-s_getpayload.c += -fno-builtin-getpayloadl 109+CFLAGS-w_hypot.c += -fno-builtin-hypotl 110+CFLAGS-w_ilogb.c += -fno-builtin-ilogbl 111+CFLAGS-s_isinf.c += -fno-builtin-isinfl 112+CFLAGS-s_isnan.c += -fno-builtin-isnanl 113+CFLAGS-w_j0.c += -fno-builtin-j0l 114+CFLAGS-w_j1.c += -fno-builtin-j1l 115+CFLAGS-w_jn.c += -fno-builtin-jnl 116+CFLAGS-s_ldexp.c += -fno-builtin-ldexpl 117+CFLAGS-w_lgamma.c += -fno-builtin-lgammal 118+CFLAGS-w_lgamma_r.c += -fno-builtin-lgammal_r 119+CFLAGS-w_llogb.c += -fno-builtin-llogbl 120+CFLAGS-s_llrint.c += -fno-builtin-llrintl 121+CFLAGS-s_llround.c += -fno-builtin-llroundl 122+CFLAGS-e_log.c += -fno-builtin-logl 123+CFLAGS-w_log10.c += -fno-builtin-log10l 124+CFLAGS-w_log1p.c += -fno-builtin-log1pl 125+CFLAGS-e_log2.c += -fno-builtin-log2l 126+CFLAGS-s_logb.c += -fno-builtin-logbl 127+CFLAGS-s_lrint.c += -fno-builtin-lrintl 128+CFLAGS-s_lround.c += -fno-builtin-lroundl 129+CFLAGS-s_modf.c += -fno-builtin-modfl 130+CFLAGS-s_nan.c += -fno-builtin-nanl 131+CFLAGS-s_nearbyint.c += -fno-builtin-nearbyintl 132+CFLAGS-s_nextafter.c += -fno-builtin-nextafterl 133+CFLAGS-s_nextdown.c += -fno-builtin-nextdownl 134+CFLAGS-s_nexttoward.c += -fno-builtin-nexttoward -fno-builtin-nexttowardl 135+CFLAGS-s_nexttowardf.c += -fno-builtin-nexttowardf 136+CFLAGS-s_nextup.c += -fno-builtin-nextupl 137+CFLAGS-e_pow.c += -fno-builtin-powl 138+CFLAGS-w_remainder.c += -fno-builtin-remainderl -fno-builtin-dreml 139+CFLAGS-s_remquo.c += -fno-builtin-remquol 140+CFLAGS-s_rint.c += -fno-builtin-rintl 141+CFLAGS-s_round.c += -fno-builtin-roundl 142+CFLAGS-s_roundeven.c += -fno-builtin-roundevenl 143+CFLAGS-w_scalb.c += -fno-builtin-scalbl 144+CFLAGS-w_scalbln.c += -fno-builtin-scalblnl 145+CFLAGS-s_scalbn.c += -fno-builtin-scalbnl 146+CFLAGS-s_setpayload.c += -fno-builtin-setpayloadl 147+CFLAGS-s_setpayloadsig.c += -fno-builtin-setpayloadsigl 148+CFLAGS-s_significand.c += -fno-builtin-significandl 149+CFLAGS-s_sin.c += -fno-builtin-sinl 150+CFLAGS-s_sincos.c += -fno-builtin-sincosl 151+CFLAGS-w_sinh.c += -fno-builtin-sinhl 152+CFLAGS-w_sqrt.c += -fno-builtin-sqrtl 153+CFLAGS-s_tan.c += -fno-builtin-tanl 154+CFLAGS-s_tanh.c += -fno-builtin-tanhl 155+CFLAGS-w_tgamma.c += -fno-builtin-tgammal 156+CFLAGS-s_totalorder.c += -fno-builtin-totalorderl 157+CFLAGS-s_totalordermag.c += -fno-builtin-totalordermagl 158+CFLAGS-s_trunc.c += -fno-builtin-truncl 159+CFLAGS-s_ufromfp.c += -fno-builtin-ufromfpl 160+CFLAGS-s_ufromfpx.c += -fno-builtin-ufromfpxl 161+CFLAGS-s_y0.c += -fno-builtin-y0l 162+CFLAGS-s_y1.c += -fno-builtin-y1l 163+CFLAGS-s_yn.c += -fno-builtin-ynl 164 endif 165 166 # These files quiet sNaNs in a way that is optimized away without 167-- 1682.20.1 169 170