@@ -642,7 +642,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
642
642
// Length Modifier Tests.
643
643
644
644
written = LIBC_NAMESPACE::sprintf (buff, " %La" , 0 .1L );
645
- #if defined(SPECIAL_X86_LONG_DOUBLE )
645
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
646
646
ASSERT_STREQ_LEN (written, buff, " 0xc.ccccccccccccccdp-7" );
647
647
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
648
648
ASSERT_STREQ_LEN (written, buff, " 0x1.999999999999ap-4" );
@@ -651,7 +651,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
651
651
#endif
652
652
653
653
written = LIBC_NAMESPACE::sprintf (buff, " %La" , 1 .0e1000L);
654
- #if defined(SPECIAL_X86_LONG_DOUBLE )
654
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
655
655
ASSERT_STREQ_LEN (written, buff, " 0xf.38db1f9dd3dac05p+3318" );
656
656
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
657
657
ASSERT_STREQ_LEN (written, buff, " inf" );
@@ -660,7 +660,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
660
660
#endif
661
661
662
662
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 )
664
664
ASSERT_STREQ_LEN (written, buff, " 0x8.68a9188a89e1467p-3325" );
665
665
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
666
666
ASSERT_STREQ_LEN (written, buff, " 0x0p+0" );
@@ -766,7 +766,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
766
766
ASSERT_STREQ_LEN (written, buff, " 0x0p+0" );
767
767
768
768
written = LIBC_NAMESPACE::sprintf (buff, " %.1La" , 0 .1L );
769
- #if defined(SPECIAL_X86_LONG_DOUBLE )
769
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
770
770
ASSERT_STREQ_LEN (written, buff, " 0xc.dp-7" );
771
771
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
772
772
ASSERT_STREQ_LEN (written, buff, " 0x1.ap-4" );
@@ -775,7 +775,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
775
775
#endif
776
776
777
777
written = LIBC_NAMESPACE::sprintf (buff, " %.1La" , 0xf .fffffffffffffffp16380L );
778
- #if defined(SPECIAL_X86_LONG_DOUBLE )
778
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
779
779
ASSERT_STREQ_LEN (written, buff, " 0x1.0p+16384" );
780
780
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
781
781
ASSERT_STREQ_LEN (written, buff, " inf" );
@@ -1024,7 +1024,8 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
1024
1024
1025
1025
// Some float128 systems (specifically the ones used for aarch64 buildbots)
1026
1026
// 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)
1028
1029
written = LIBC_NAMESPACE::sprintf (buff, " %LF" , -ld_nan);
1029
1030
ASSERT_STREQ_LEN (written, buff, " -NAN" );
1030
1031
#endif
@@ -1042,7 +1043,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
1042
1043
written = LIBC_NAMESPACE::sprintf (buff, " %.Lf" , -2 .5L );
1043
1044
ASSERT_STREQ_LEN (written, buff, " -2" );
1044
1045
1045
- #if defined(SPECIAL_X86_LONG_DOUBLE )
1046
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
1046
1047
1047
1048
written = LIBC_NAMESPACE::sprintf (buff, " %Lf" , 1e100L);
1048
1049
ASSERT_STREQ_LEN (written, buff,
@@ -1327,11 +1328,11 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
1327
1328
" 570449525088342437216896462077260223998756027453411520977536701491759878"
1328
1329
" 422771447006016890777855573925295187921971811871399320142563330377888532"
1329
1330
" 179817332113" );
1330
- #endif // SPECIAL_X86_LONG_DOUBLE
1331
+ #endif // LIBC_LONG_DOUBLE_IS_X86_FLOAT80
1331
1332
1332
1333
/*
1333
1334
written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
1334
- #if defined(SPECIAL_X86_LONG_DOUBLE )
1335
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
1335
1336
ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
1336
1337
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
1337
1338
ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
@@ -1340,7 +1341,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
1340
1341
#endif
1341
1342
1342
1343
written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
1343
- #if defined(SPECIAL_X86_LONG_DOUBLE )
1344
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
1344
1345
ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
1345
1346
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
1346
1347
ASSERT_STREQ_LEN(written, buff, "inf");
@@ -1349,7 +1350,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
1349
1350
#endif
1350
1351
1351
1352
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 )
1353
1354
ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
1354
1355
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
1355
1356
ASSERT_STREQ_LEN(written, buff, "0x0p+0");
@@ -1548,7 +1549,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
1548
1549
1549
1550
/*
1550
1551
written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
1551
- #if defined(SPECIAL_X86_LONG_DOUBLE )
1552
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
1552
1553
ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
1553
1554
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
1554
1555
ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -1557,7 +1558,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
1557
1558
#endif
1558
1559
1559
1560
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 )
1561
1562
ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
1562
1563
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
1563
1564
ASSERT_STREQ_LEN(written, buff, "inf");
@@ -1858,7 +1859,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
1858
1859
1859
1860
// Length Modifier Tests.
1860
1861
1861
- #if defined(SPECIAL_X86_LONG_DOUBLE )
1862
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
1862
1863
written = LIBC_NAMESPACE::sprintf (buff, " %.9Le" , 1000000000500000000 .1L );
1863
1864
ASSERT_STREQ_LEN (written, buff, " 1.000000001e+18" );
1864
1865
@@ -1975,7 +1976,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
1975
1976
*/
1976
1977
/*
1977
1978
written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
1978
- #if defined(SPECIAL_X86_LONG_DOUBLE )
1979
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
1979
1980
ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
1980
1981
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
1981
1982
ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
@@ -1984,7 +1985,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
1984
1985
#endif
1985
1986
1986
1987
written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
1987
- #if defined(SPECIAL_X86_LONG_DOUBLE )
1988
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
1988
1989
ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
1989
1990
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
1990
1991
ASSERT_STREQ_LEN(written, buff, "inf");
@@ -1993,7 +1994,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
1993
1994
#endif
1994
1995
1995
1996
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 )
1997
1998
ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
1998
1999
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
1999
2000
ASSERT_STREQ_LEN(written, buff, "0x0p+0");
@@ -2171,7 +2172,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
2171
2172
2172
2173
/*
2173
2174
written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
2174
- #if defined(SPECIAL_X86_LONG_DOUBLE )
2175
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
2175
2176
ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
2176
2177
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
2177
2178
ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -2180,7 +2181,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
2180
2181
#endif
2181
2182
2182
2183
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 )
2184
2185
ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
2185
2186
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
2186
2187
ASSERT_STREQ_LEN(written, buff, "inf");
@@ -2499,15 +2500,15 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
2499
2500
2500
2501
// Length Modifier Tests.
2501
2502
2502
- #if defined(SPECIAL_X86_LONG_DOUBLE )
2503
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
2503
2504
2504
2505
written = LIBC_NAMESPACE::sprintf (buff, " %Lg" , 0xf .fffffffffffffffp +16380L );
2505
2506
ASSERT_STREQ_LEN (written, buff, " 1.18973e+4932" );
2506
2507
2507
2508
written = LIBC_NAMESPACE::sprintf (buff, " %Lg" , 0xa .aaaaaaaaaaaaaabp -7L );
2508
2509
ASSERT_STREQ_LEN (written, buff, " 0.0833333" );
2509
2510
2510
- #endif // SPECIAL_X86_LONG_DOUBLE
2511
+ #endif // LIBC_LONG_DOUBLE_IS_X86_FLOAT80
2511
2512
2512
2513
// TODO: Uncomment the below tests after long double support is added
2513
2514
/*
@@ -2614,7 +2615,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
2614
2615
*/
2615
2616
/*
2616
2617
written = LIBC_NAMESPACE::sprintf(buff, "%La", 0.1L);
2617
- #if defined(SPECIAL_X86_LONG_DOUBLE )
2618
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
2618
2619
ASSERT_STREQ_LEN(written, buff, "0xc.ccccccccccccccdp-7");
2619
2620
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
2620
2621
ASSERT_STREQ_LEN(written, buff, "0x1.999999999999ap-4");
@@ -2623,7 +2624,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
2623
2624
#endif
2624
2625
2625
2626
written = LIBC_NAMESPACE::sprintf(buff, "%La", 1.0e1000L);
2626
- #if defined(SPECIAL_X86_LONG_DOUBLE )
2627
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
2627
2628
ASSERT_STREQ_LEN(written, buff, "0xf.38db1f9dd3dac05p+3318");
2628
2629
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
2629
2630
ASSERT_STREQ_LEN(written, buff, "inf");
@@ -2632,7 +2633,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
2632
2633
#endif
2633
2634
2634
2635
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 )
2636
2637
ASSERT_STREQ_LEN(written, buff, "0x8.68a9188a89e1467p-3325");
2637
2638
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
2638
2639
ASSERT_STREQ_LEN(written, buff, "0x0p+0");
@@ -2806,21 +2807,21 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
2806
2807
written = LIBC_NAMESPACE::sprintf (buff, " %.10g" , 0x1 .0p-1074 );
2807
2808
ASSERT_STREQ_LEN (written, buff, " 4.940656458e-324" );
2808
2809
2809
- #if defined(SPECIAL_X86_LONG_DOUBLE )
2810
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
2810
2811
2811
2812
written = LIBC_NAMESPACE::sprintf (buff, " %.60Lg" , 0xa .aaaaaaaaaaaaaabp -7L );
2812
2813
ASSERT_STREQ_LEN (
2813
2814
written, buff,
2814
2815
" 0.0833333333333333333355920878593448009041821933351457118988037" );
2815
2816
2816
- #endif // SPECIAL_X86_LONG_DOUBLE
2817
+ #endif // LIBC_LONG_DOUBLE_IS_X86_FLOAT80
2817
2818
2818
2819
// Long double precision tests.
2819
2820
// These are currently commented out because they require long double support
2820
2821
// that isn't ready yet.
2821
2822
/*
2822
2823
written = LIBC_NAMESPACE::sprintf(buff, "%.1La", 0.1L);
2823
- #if defined(SPECIAL_X86_LONG_DOUBLE )
2824
+ #if defined(LIBC_LONG_DOUBLE_IS_X86_FLOAT80 )
2824
2825
ASSERT_STREQ_LEN(written, buff, "0xc.dp-7");
2825
2826
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
2826
2827
ASSERT_STREQ_LEN(written, buff, "0x1.ap-4");
@@ -2829,7 +2830,7 @@ TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
2829
2830
#endif
2830
2831
2831
2832
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 )
2833
2834
ASSERT_STREQ_LEN(written, buff, "0x1.0p+16384");
2834
2835
#elif defined(LIBC_LONG_DOUBLE_IS_FLOAT64)
2835
2836
ASSERT_STREQ_LEN(written, buff, "inf");
0 commit comments