From d8c2869d4450d54935c3410ad3093d51b5d85f79 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Fri, 20 Jun 2014 07:44:42 +0530 Subject: [PATCH] Generate en_GB.UTF-8 during testing This patch generates en_GB.UTF-8, which is used in tst-strcoll-overflow. This solves the issue of failing xtests on s390/s390x. --- ChangeLog | 4 ++++ localedata/Makefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ec08f77bf1..e2a19339c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-20 Stefan Liebler + + * Makefile (LOCALES): Add en_GB.UTF-8. + 2014-06-19 H.J. Lu * sysdeps/x86/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Use diff --git a/localedata/Makefile b/localedata/Makefile index 023f443206..e8fe10fbdc 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -105,7 +105,7 @@ LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \ hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \ nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 tr_TR.UTF-8 cs_CZ.UTF-8 \ zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 si_LK.UTF-8 \ - tr_TR.ISO-8859-9 + tr_TR.ISO-8859-9 en_GB.UTF-8 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g') CHARMAPS := $(shell echo "$(LOCALES)" | \ sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g)