@@ -642,7 +642,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
642642 // Length Modifier Tests.
643643
644644 written = LIBC_NAMESPACE::sprintf (buff, " %La" , 0 .1L );
645- #if defined(SPECIAL_X86_LONG_DOUBLE )
645+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
646646 ASSERT_STREQ_LEN (written, buff, " 0xc.ccccccccccccccdp-7" );
647647#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
648648 ASSERT_STREQ_LEN (written, buff, " 0x1.999999999999ap-4" );
@@ -651,7 +651,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
651651#endif
652652
653653 written = LIBC_NAMESPACE::sprintf (buff, " %La" , 1 .0e1000L);
654- #if defined(SPECIAL_X86_LONG_DOUBLE )
654+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
655655 ASSERT_STREQ_LEN (written, buff, " 0xf.38db1f9dd3dac05p+3318" );
656656#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
657657 ASSERT_STREQ_LEN (written, buff, " inf" );
@@ -660,7 +660,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
660660#endif
661661
662662 written = LIBC_NAMESPACE::sprintf (buff, " %La" , 1 .0e-1000L );
663- #if defined(SPECIAL_X86_LONG_DOUBLE )
663+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
664664 ASSERT_STREQ_LEN (written, buff, " 0x8.68a9188a89e1467p-3325" );
665665#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
666666 ASSERT_STREQ_LEN (written, buff, " 0x0p+0" );
@@ -766,7 +766,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
766766 ASSERT_STREQ_LEN (written, buff, " 0x0p+0" );
767767
768768 written = LIBC_NAMESPACE::sprintf (buff, " %.1La" , 0 .1L );
769- #if defined(SPECIAL_X86_LONG_DOUBLE )
769+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
770770 ASSERT_STREQ_LEN (written, buff, " 0xc.dp-7" );
771771#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
772772 ASSERT_STREQ_LEN (written, buff, " 0x1.ap-4" );
@@ -775,7 +775,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
775775#endif
776776
777777 written = LIBC_NAMESPACE::sprintf (buff, " %.1La" , 0xf .fffffffffffffffp16380L );
778- #if defined(SPECIAL_X86_LONG_DOUBLE )
778+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
779779 ASSERT_STREQ_LEN (written, buff, " 0x1.0p+16384" );
780780#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
781781 ASSERT_STREQ_LEN (written, buff, " inf" );
@@ -1024,7 +1024,8 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
10241024
10251025// Some float128 systems (specifically the ones used for aarch64 buildbots)
10261026// don't respect signs for long double NaNs.
1027- #if defined(SPECIAL_X86_LONG_DOUBLE) || defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
1027+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80) || \
1028+ defined (LIBC_LONG_DOUBLE_IS_FLOAT64)
10281029 written = LIBC_NAMESPACE::sprintf (buff, " %LF" , -ld_nan);
10291030 ASSERT_STREQ_LEN (written, buff, " -NAN" );
10301031#endif
@@ -1042,7 +1043,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
10421043 written = LIBC_NAMESPACE::sprintf (buff, " %.Lf" , -2 .5L );
10431044 ASSERT_STREQ_LEN (written, buff, " -2" );
10441045
1045- #if defined(SPECIAL_X86_LONG_DOUBLE )
1046+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
10461047
10471048 written = LIBC_NAMESPACE::sprintf (buff, " %Lf" , 1e100L);
10481049 ASSERT_STREQ_LEN (written, buff,
@@ -1327,11 +1328,11 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
13271328 " 570449525088342437216896462077260223998756027453411520977536701491759878"
13281329 " 422771447006016890777855573925295187921971811871399320142563330377888532"
13291330 " 179817332113" );
1330- #endif // SPECIAL_X86_LONG_DOUBLE
1331+ #endif // LIBC_LONG_DOUBLE_IS_X86_FLOAT80
13311332
13321333 /*
13331334 written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
1334- #if defined(SPECIAL_X86_LONG_DOUBLE )
1335+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
13351336 ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
13361337 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
13371338 ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
@@ -1340,7 +1341,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
13401341 #endif
13411342
13421343 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
1343- #if defined(SPECIAL_X86_LONG_DOUBLE )
1344+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
13441345 ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
13451346 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
13461347 ASSERT_STREQ_LEN(written, buff, "inf");
@@ -1349,7 +1350,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
13491350 #endif
13501351
13511352 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e-1000L);
1352- #if defined(SPECIAL_X86_LONG_DOUBLE )
1353+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
13531354 ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
13541355 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
13551356 ASSERT_STREQ_LEN(written, buff, "0x0p+0");
@@ -1548,7 +1549,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
15481549
15491550 /*
15501551 written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
1551- #if defined(SPECIAL_X86_LONG_DOUBLE )
1552+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
15521553 ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
15531554 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
15541555 ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -1557,7 +1558,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
15571558 #endif
15581559
15591560 written = LIBC_NAMESPACE::sprintf(buff, "%.1La",
1560- 0xf.fffffffffffffffp16380L); #if defined(SPECIAL_X86_LONG_DOUBLE )
1561+ 0xf.fffffffffffffffp16380L); #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
15611562 ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
15621563 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
15631564 ASSERT_STREQ_LEN(written, buff, "inf");
@@ -1858,7 +1859,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
18581859
18591860 // Length Modifier Tests.
18601861
1861- #if defined(SPECIAL_X86_LONG_DOUBLE )
1862+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
18621863 written = LIBC_NAMESPACE::sprintf (buff, " %.9Le" , 1000000000500000000 .1L );
18631864 ASSERT_STREQ_LEN (written, buff, " 1.000000001e+18" );
18641865
@@ -1975,7 +1976,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
19751976*/
19761977 /*
19771978 written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
1978- #if defined(SPECIAL_X86_LONG_DOUBLE )
1979+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
19791980 ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
19801981 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
19811982 ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
@@ -1984,7 +1985,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
19841985 #endif
19851986
19861987 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
1987- #if defined(SPECIAL_X86_LONG_DOUBLE )
1988+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
19881989 ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
19891990 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
19901991 ASSERT_STREQ_LEN(written, buff, "inf");
@@ -1993,7 +1994,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
19931994 #endif
19941995
19951996 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e-1000L);
1996- #if defined(SPECIAL_X86_LONG_DOUBLE )
1997+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
19971998 ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
19981999 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
19992000 ASSERT_STREQ_LEN(written, buff, "0x0p+0");
@@ -2171,7 +2172,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
21712172
21722173 /*
21732174 written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
2174- #if defined(SPECIAL_X86_LONG_DOUBLE )
2175+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
21752176 ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
21762177 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
21772178 ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -2180,7 +2181,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
21802181 #endif
21812182
21822183 written = LIBC_NAMESPACE::sprintf(buff, "%.1La",
2183- 0xf.fffffffffffffffp16380L); #if defined(SPECIAL_X86_LONG_DOUBLE )
2184+ 0xf.fffffffffffffffp16380L); #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
21842185 ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
21852186 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
21862187 ASSERT_STREQ_LEN(written, buff, "inf");
@@ -2499,15 +2500,15 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
24992500
25002501 // Length Modifier Tests.
25012502
2502- #if defined(SPECIAL_X86_LONG_DOUBLE )
2503+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
25032504
25042505 written = LIBC_NAMESPACE::sprintf (buff, " %Lg" , 0xf .fffffffffffffffp +16380L );
25052506 ASSERT_STREQ_LEN (written, buff, " 1.18973e+4932" );
25062507
25072508 written = LIBC_NAMESPACE::sprintf (buff, " %Lg" , 0xa .aaaaaaaaaaaaaabp -7L );
25082509 ASSERT_STREQ_LEN (written, buff, " 0.0833333" );
25092510
2510- #endif // SPECIAL_X86_LONG_DOUBLE
2511+ #endif // LIBC_LONG_DOUBLE_IS_X86_FLOAT80
25112512
25122513 // TODO: Uncomment the below tests after long double support is added
25132514 /*
@@ -2614,7 +2615,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
26142615*/
26152616 /*
26162617 written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
2617- #if defined(SPECIAL_X86_LONG_DOUBLE )
2618+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
26182619 ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
26192620 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
26202621 ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
@@ -2623,7 +2624,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
26232624 #endif
26242625
26252626 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
2626- #if defined(SPECIAL_X86_LONG_DOUBLE )
2627+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
26272628 ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
26282629 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
26292630 ASSERT_STREQ_LEN(written, buff, "inf");
@@ -2632,7 +2633,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
26322633 #endif
26332634
26342635 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e-1000L);
2635- #if defined(SPECIAL_X86_LONG_DOUBLE )
2636+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
26362637 ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
26372638 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
26382639 ASSERT_STREQ_LEN(written, buff, "0x0p+0");
@@ -2806,21 +2807,21 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
28062807 written = LIBC_NAMESPACE::sprintf (buff, " %.10g" , 0x1 .0p-1074 );
28072808 ASSERT_STREQ_LEN (written, buff, " 4.940656458e-324" );
28082809
2809- #if defined(SPECIAL_X86_LONG_DOUBLE )
2810+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
28102811
28112812 written = LIBC_NAMESPACE::sprintf (buff, " %.60Lg" , 0xa .aaaaaaaaaaaaaabp -7L );
28122813 ASSERT_STREQ_LEN (
28132814 written, buff,
28142815 " 0.0833333333333333333355920878593448009041821933351457118988037" );
28152816
2816- #endif // SPECIAL_X86_LONG_DOUBLE
2817+ #endif // LIBC_LONG_DOUBLE_IS_X86_FLOAT80
28172818
28182819 // Long double precision tests.
28192820 // These are currently commented out because they require long double support
28202821 // that isn't ready yet.
28212822 /*
28222823 written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
2823- #if defined(SPECIAL_X86_LONG_DOUBLE )
2824+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
28242825 ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
28252826 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
28262827 ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -2829,7 +2830,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
28292830 #endif
28302831
28312832 written = LIBC_NAMESPACE::sprintf(buff, "%.1La",
2832- 0xf.fffffffffffffffp16380L); #if defined(SPECIAL_X86_LONG_DOUBLE )
2833+ 0xf.fffffffffffffffp16380L); #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
28332834 ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
28342835 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
28352836 ASSERT_STREQ_LEN(written, buff, "inf");
0 commit comments