@@ -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,7 @@ 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 ) || defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
10281028 written = LIBC_NAMESPACE::sprintf (buff, " %LF" , -ld_nan);
10291029 ASSERT_STREQ_LEN (written, buff, " -NAN" );
10301030#endif
@@ -1042,7 +1042,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
10421042 written = LIBC_NAMESPACE::sprintf (buff, " %.Lf" , -2 .5L );
10431043 ASSERT_STREQ_LEN (written, buff, " -2" );
10441044
1045- #if defined(SPECIAL_X86_LONG_DOUBLE )
1045+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
10461046
10471047 written = LIBC_NAMESPACE::sprintf (buff, " %Lf" , 1e100L);
10481048 ASSERT_STREQ_LEN (written, buff,
@@ -1327,11 +1327,11 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
13271327 " 570449525088342437216896462077260223998756027453411520977536701491759878"
13281328 " 422771447006016890777855573925295187921971811871399320142563330377888532"
13291329 " 179817332113" );
1330- #endif // SPECIAL_X86_LONG_DOUBLE
1330+ #endif // LIBC_LONG_DOUBLE_IS_X86_FLOAT80
13311331
13321332 /*
13331333 written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
1334- #if defined(SPECIAL_X86_LONG_DOUBLE )
1334+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
13351335 ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
13361336 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
13371337 ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
@@ -1340,7 +1340,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
13401340 #endif
13411341
13421342 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
1343- #if defined(SPECIAL_X86_LONG_DOUBLE )
1343+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
13441344 ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
13451345 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
13461346 ASSERT_STREQ_LEN(written, buff, "inf");
@@ -1349,7 +1349,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
13491349 #endif
13501350
13511351 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e-1000L);
1352- #if defined(SPECIAL_X86_LONG_DOUBLE )
1352+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
13531353 ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
13541354 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
13551355 ASSERT_STREQ_LEN(written, buff, "0x0p+0");
@@ -1548,7 +1548,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
15481548
15491549 /*
15501550 written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
1551- #if defined(SPECIAL_X86_LONG_DOUBLE )
1551+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
15521552 ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
15531553 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
15541554 ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -1557,7 +1557,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
15571557 #endif
15581558
15591559 written = LIBC_NAMESPACE::sprintf(buff, "%.1La",
1560- 0xf.fffffffffffffffp16380L); #if defined(SPECIAL_X86_LONG_DOUBLE )
1560+ 0xf.fffffffffffffffp16380L); #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
15611561 ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
15621562 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
15631563 ASSERT_STREQ_LEN(written, buff, "inf");
@@ -1858,7 +1858,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
18581858
18591859 // Length Modifier Tests.
18601860
1861- #if defined(SPECIAL_X86_LONG_DOUBLE )
1861+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
18621862 written = LIBC_NAMESPACE::sprintf (buff, " %.9Le" , 1000000000500000000 .1L );
18631863 ASSERT_STREQ_LEN (written, buff, " 1.000000001e+18" );
18641864
@@ -1975,7 +1975,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
19751975*/
19761976 /*
19771977 written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
1978- #if defined(SPECIAL_X86_LONG_DOUBLE )
1978+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
19791979 ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
19801980 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
19811981 ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
@@ -1984,7 +1984,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
19841984 #endif
19851985
19861986 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
1987- #if defined(SPECIAL_X86_LONG_DOUBLE )
1987+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
19881988 ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
19891989 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
19901990 ASSERT_STREQ_LEN(written, buff, "inf");
@@ -1993,7 +1993,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
19931993 #endif
19941994
19951995 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e-1000L);
1996- #if defined(SPECIAL_X86_LONG_DOUBLE )
1996+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
19971997 ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
19981998 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
19991999 ASSERT_STREQ_LEN(written, buff, "0x0p+0");
@@ -2171,7 +2171,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
21712171
21722172 /*
21732173 written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
2174- #if defined(SPECIAL_X86_LONG_DOUBLE )
2174+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
21752175 ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
21762176 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
21772177 ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -2180,7 +2180,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
21802180 #endif
21812181
21822182 written = LIBC_NAMESPACE::sprintf(buff, "%.1La",
2183- 0xf.fffffffffffffffp16380L); #if defined(SPECIAL_X86_LONG_DOUBLE )
2183+ 0xf.fffffffffffffffp16380L); #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
21842184 ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
21852185 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
21862186 ASSERT_STREQ_LEN(written, buff, "inf");
@@ -2499,15 +2499,15 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
24992499
25002500 // Length Modifier Tests.
25012501
2502- #if defined(SPECIAL_X86_LONG_DOUBLE )
2502+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
25032503
25042504 written = LIBC_NAMESPACE::sprintf (buff, " %Lg" , 0xf .fffffffffffffffp +16380L );
25052505 ASSERT_STREQ_LEN (written, buff, " 1.18973e+4932" );
25062506
25072507 written = LIBC_NAMESPACE::sprintf (buff, " %Lg" , 0xa .aaaaaaaaaaaaaabp -7L );
25082508 ASSERT_STREQ_LEN (written, buff, " 0.0833333" );
25092509
2510- #endif // SPECIAL_X86_LONG_DOUBLE
2510+ #endif // LIBC_LONG_DOUBLE_IS_X86_FLOAT80
25112511
25122512 // TODO: Uncomment the below tests after long double support is added
25132513 /*
@@ -2614,7 +2614,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
26142614*/
26152615 /*
26162616 written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
2617- #if defined(SPECIAL_X86_LONG_DOUBLE )
2617+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
26182618 ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
26192619 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
26202620 ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
@@ -2623,7 +2623,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
26232623 #endif
26242624
26252625 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
2626- #if defined(SPECIAL_X86_LONG_DOUBLE )
2626+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
26272627 ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
26282628 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
26292629 ASSERT_STREQ_LEN(written, buff, "inf");
@@ -2632,7 +2632,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
26322632 #endif
26332633
26342634 written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e-1000L);
2635- #if defined(SPECIAL_X86_LONG_DOUBLE )
2635+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
26362636 ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
26372637 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
26382638 ASSERT_STREQ_LEN(written, buff, "0x0p+0");
@@ -2806,21 +2806,21 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
28062806 written = LIBC_NAMESPACE::sprintf (buff, " %.10g" , 0x1 .0p-1074 );
28072807 ASSERT_STREQ_LEN (written, buff, " 4.940656458e-324" );
28082808
2809- #if defined(SPECIAL_X86_LONG_DOUBLE )
2809+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
28102810
28112811 written = LIBC_NAMESPACE::sprintf (buff, " %.60Lg" , 0xa .aaaaaaaaaaaaaabp -7L );
28122812 ASSERT_STREQ_LEN (
28132813 written, buff,
28142814 " 0.0833333333333333333355920878593448009041821933351457118988037" );
28152815
2816- #endif // SPECIAL_X86_LONG_DOUBLE
2816+ #endif // LIBC_LONG_DOUBLE_IS_X86_FLOAT80
28172817
28182818 // Long double precision tests.
28192819 // These are currently commented out because they require long double support
28202820 // that isn't ready yet.
28212821 /*
28222822 written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
2823- #if defined(SPECIAL_X86_LONG_DOUBLE )
2823+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
28242824 ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
28252825 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
28262826 ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -2829,7 +2829,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
28292829 #endif
28302830
28312831 written = LIBC_NAMESPACE::sprintf(buff, "%.1La",
2832- 0xf.fffffffffffffffp16380L); #if defined(SPECIAL_X86_LONG_DOUBLE )
2832+ 0xf.fffffffffffffffp16380L); #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
28332833 ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
28342834 #elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
28352835 ASSERT_STREQ_LEN(written, buff, "inf");
0 commit comments