about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--localedata/Makefile15
2 files changed, 23 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 968a464dc0..7e316130fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2017-07-21  Steve Ellcey  <sellcey@cavium.com>
 
+	* localedata/Makefile (CFLAGS-tst_iswalnum.c, CFLAGS-tst_iswalpha.c
+	CFLAGS-tst_iswcntrl.c, CFLAGS-tst_iswdigit.c, CFLAGS-tst_iswgraph.c,
+	CFLAGS-tst_iswlower.c, CFLAGS-tst_iswprint.c, CFLAGS-tst_iswpunct.c,
+	CFLAGS-tst_iswspace.c, CFLAGS-tst_iswupper.c, CFLAGS-tst_iswxdigit.c,
+	CFLAGS-tst_towlower.c, CFLAGS-tst_towupper.c): New macros.
+
+2017-07-21  Steve Ellcey  <sellcey@cavium.com>
+
 	* nss/nss_test1.c (default_npwd_data): Fix definition.
 
 2017-07-21  Steve Ellcey  <sellcey@cavium.com>
diff --git a/localedata/Makefile b/localedata/Makefile
index 47ca39d76a..20c5921aea 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -122,6 +122,21 @@ $(inst_i18ndir)/charmaps/%.gz: charmaps/% $(+force)
 # Install the locale source files in the appropriate directory.
 $(inst_i18ndir)/locales/%: locales/% $(+force); $(do-install)
 
+# These tests use multistatement macros from tests-mbwc/tst_funcs.h
+# and will not compile with GCC 8.1 without the warning turned off.
+CFLAGS-tst_iswalnum.c  = -Wno-multistatement-macros
+CFLAGS-tst_iswalpha.c  = -Wno-multistatement-macros
+CFLAGS-tst_iswcntrl.c  = -Wno-multistatement-macros
+CFLAGS-tst_iswdigit.c  = -Wno-multistatement-macros
+CFLAGS-tst_iswgraph.c  = -Wno-multistatement-macros
+CFLAGS-tst_iswlower.c  = -Wno-multistatement-macros
+CFLAGS-tst_iswprint.c  = -Wno-multistatement-macros
+CFLAGS-tst_iswpunct.c  = -Wno-multistatement-macros
+CFLAGS-tst_iswspace.c  = -Wno-multistatement-macros
+CFLAGS-tst_iswupper.c  = -Wno-multistatement-macros
+CFLAGS-tst_iswxdigit.c = -Wno-multistatement-macros
+CFLAGS-tst_towlower.c  = -Wno-multistatement-macros
+CFLAGS-tst_towupper.c  = -Wno-multistatement-macros
 
 ifeq ($(run-built-tests),yes)
 generated-dirs += $(LOCALES)