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