aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2017-06-27 17:12:13 +0000
committerJoseph Myers <joseph@codesourcery.com>2017-06-27 17:12:13 +0000
commite4043b84c49e1cf9bcf1e8320233343ecc34f8eb (patch)
treed977c8e2c0e4b4086efed6ca25115646a6574a42 /ChangeLog
parentf8f72bc0c3da8ba039e6a1ed670ca576120b1f85 (diff)
downloadglibc-e4043b84c49e1cf9bcf1e8320233343ecc34f8eb.tar
glibc-e4043b84c49e1cf9bcf1e8320233343ecc34f8eb.tar.gz
glibc-e4043b84c49e1cf9bcf1e8320233343ecc34f8eb.tar.bz2
glibc-e4043b84c49e1cf9bcf1e8320233343ecc34f8eb.zip
Fix strftime build with GCC 8.
Building with current GCC mainline fails with: strftime_l.c: In function '__strftime_internal': strftime_l.c:719:4: error: macro expands to multiple statements [-Werror=multistatement-macros] digits = d > width ? d : width; \ ^ strftime_l.c:1260:6: note: in expansion of macro 'DO_NUMBER' DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE); ^~~~~~~~~ strftime_l.c:1259:4: note: some parts of macro expansion are not guarded by this 'else' clause else ^~~~ In fact this particular instance is harmless; the code looks like: if (modifier == L_('O')) goto bad_format; else DO_NUMBER (1, tp->tm_year + TM_YEAR_BASE); and because of the goto, it doesn't matter that part of the expansion isn't under the "else" conditional. But it's also clearly bad style to rely on that. This patch changes DO_NUMBER and DO_NUMBER_SPACEPAD to use do { } while (0) to avoid such problems. Tested (full testsuite) for x86_64 (GCC 6), and with build-many-glibcs.py with GCC mainline, in conjunction with my libgcc patch <https://gcc.gnu.org/ml/gcc-patches/2017-06/msg02032.html>. * time/strftime_l.c (DO_NUMBER): Define using do { } while (0). (DO_NUMBER_SPACEPAD): Likewise.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ad24611cfa..6ed7f08529 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-27 Joseph Myers <joseph@codesourcery.com>
+
+ * time/strftime_l.c (DO_NUMBER): Define using do { } while (0).
+ (DO_NUMBER_SPACEPAD): Likewise.
+
2017-06-27 Prakhar Bahuguna <prakhar.bahuguna@arm.com>
* sysdeps/arm/armv7/multiarch/Makefile: Add memchr_neon to