[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r24598 - in /fsf/trunk/libc: localedata/ localedata/locales/ ports/ ports/sysdeps/arm/ ports/sysdeps/arm/armv7/multiarch/
- To: commits@xxxxxxxxxx
- Subject: [Commits] r24598 - in /fsf/trunk/libc: localedata/ localedata/locales/ ports/ ports/sysdeps/arm/ ports/sysdeps/arm/armv7/multiarch/
- From: eglibc@xxxxxxxxxx
- Date: Sat, 23 Nov 2013 08:01:56 -0000
Author: eglibc
Date: Sat Nov 23 00:01:55 2013
New Revision: 24598
Log:
Import glibc-mainline for 2013-11-23
Modified:
fsf/trunk/libc/localedata/ChangeLog
fsf/trunk/libc/localedata/locales/de_AT
fsf/trunk/libc/localedata/locales/de_BE
fsf/trunk/libc/localedata/locales/de_CH
fsf/trunk/libc/localedata/locales/de_DE
fsf/trunk/libc/localedata/locales/de_LU
fsf/trunk/libc/localedata/locales/en_AG
fsf/trunk/libc/localedata/locales/en_AU
fsf/trunk/libc/localedata/locales/en_BW
fsf/trunk/libc/localedata/locales/en_CA
fsf/trunk/libc/localedata/locales/en_DK
fsf/trunk/libc/localedata/locales/en_GB
fsf/trunk/libc/localedata/locales/en_HK
fsf/trunk/libc/localedata/locales/en_IE
fsf/trunk/libc/localedata/locales/en_IN
fsf/trunk/libc/localedata/locales/en_NZ
fsf/trunk/libc/localedata/locales/en_PH
fsf/trunk/libc/localedata/locales/en_SG
fsf/trunk/libc/localedata/locales/en_US
fsf/trunk/libc/localedata/locales/en_ZM
fsf/trunk/libc/localedata/locales/en_ZW
fsf/trunk/libc/localedata/locales/es_AR
fsf/trunk/libc/localedata/locales/es_BO
fsf/trunk/libc/localedata/locales/es_CL
fsf/trunk/libc/localedata/locales/es_CO
fsf/trunk/libc/localedata/locales/es_CR
fsf/trunk/libc/localedata/locales/es_CU
fsf/trunk/libc/localedata/locales/es_DO
fsf/trunk/libc/localedata/locales/es_EC
fsf/trunk/libc/localedata/locales/es_ES
fsf/trunk/libc/localedata/locales/es_GT
fsf/trunk/libc/localedata/locales/es_HN
fsf/trunk/libc/localedata/locales/es_MX
fsf/trunk/libc/localedata/locales/es_NI
fsf/trunk/libc/localedata/locales/es_PA
fsf/trunk/libc/localedata/locales/es_PE
fsf/trunk/libc/localedata/locales/es_PR
fsf/trunk/libc/localedata/locales/es_PY
fsf/trunk/libc/localedata/locales/es_SV
fsf/trunk/libc/localedata/locales/es_US
fsf/trunk/libc/localedata/locales/es_UY
fsf/trunk/libc/localedata/locales/es_VE
fsf/trunk/libc/localedata/locales/fr_BE
fsf/trunk/libc/localedata/locales/fr_CA
fsf/trunk/libc/localedata/locales/fr_CH
fsf/trunk/libc/localedata/locales/fr_FR
fsf/trunk/libc/localedata/locales/fr_LU
fsf/trunk/libc/ports/ChangeLog.arm
fsf/trunk/libc/ports/sysdeps/arm/arm-features.h
fsf/trunk/libc/ports/sysdeps/arm/armv7/multiarch/memcpy_impl.S
Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Sat Nov 23 00:01:55 2013
@@ -1,3 +1,52 @@
+2013-11-22 Chris Leonard <cjl@xxxxxxxxxxxxx>
+
+ * locales/de_AT: Add lang_name to German, English, Spanish, French locales.
+ * locales/de_BE: Likewise.
+ * locales/de_CH: Likewise.
+ * locales/de_DE: Likewise.
+ * locales/de_LU: Likewise.
+ * locales/en_AG: Likewise.
+ * locales/en_AU: Likewise.
+ * locales/en_BW: Likewise.
+ * locales/en_CA: Likewise.
+ * locales/en_DK: Likewise.
+ * locales/en_GB: Likewise.
+ * locales/en_HK: Likewise.
+ * locales/en_IE: Likewise.
+ * locales/en_IN: Likewise.
+ * locales/en_NZ: Likewise.
+ * locales/en_PH: Likewise.
+ * locales/en_SG: Likewise.
+ * locales/en_US: Likewise.
+ * locales/en_ZM: Likewise.
+ * locales/en_ZW: Likewise.
+ * locales/es_AR: Likewise.
+ * locales/es_BO: Likewise.
+ * locales/es_CL: Likewise.
+ * locales/es_CO: Likewise.
+ * locales/es_CR: Likewise.
+ * locales/es_CU: Likewise.
+ * locales/es_DO: Likewise.
+ * locales/es_EC: Likewise.
+ * locales/es_ES: Likewise.
+ * locales/es_GT: Likewise.
+ * locales/es_HN: Likewise.
+ * locales/es_MX: Likewise.
+ * locales/es_NI: Likewise.
+ * locales/es_PA: Likewise.
+ * locales/es_PE: Likewise.
+ * locales/es_PR: Likewise.
+ * locales/es_PY: Likewise.
+ * locales/es_SV: Likewise.
+ * locales/es_US: Likewise.
+ * locales/es_UY: Likewise.
+ * locales/es_VE: Likewise.
+ * locales/fr_BE: Likewise.
+ * locales/fr_CA: Likewise.
+ * locales/fr_CH: Likewise.
+ * locales/fr_FR: Likewise.
+ * locales/fr_LU: Likewise.
+
2013-11-21 Chris Leonard <cjl@xxxxxxxxxxxxx>
* locales/ar_AE: Add lang_name to Arabic locales.
Modified: fsf/trunk/libc/localedata/locales/de_AT
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_AT (original)
+++ fsf/trunk/libc/localedata/locales/de_AT Sat Nov 23 00:01:55 2013
@@ -158,6 +158,8 @@
country_num 040
% A
country_car "<U0041>"
+% Deutsch
+lang_name "<U0044><U0065><U0075><U0074><U0073><U0063><U0068>"
% de
lang_ab "<U0064><U0065>"
% deu
Modified: fsf/trunk/libc/localedata/locales/de_BE
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_BE (original)
+++ fsf/trunk/libc/localedata/locales/de_BE Sat Nov 23 00:01:55 2013
@@ -152,6 +152,8 @@
country_num 056
% B
country_car "<U0042>"
+% Deutsch
+lang_name "<U0044><U0065><U0075><U0074><U0073><U0063><U0068>"
% de
lang_ab "<U0064><U0065>"
% deu
Modified: fsf/trunk/libc/localedata/locales/de_CH
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_CH (original)
+++ fsf/trunk/libc/localedata/locales/de_CH Sat Nov 23 00:01:55 2013
@@ -160,6 +160,8 @@
country_num 756
% CH
country_car "<U0043><U0048>"
+% Deutsch
+lang_name "<U0044><U0065><U0075><U0074><U0073><U0063><U0068>"
% de
lang_ab "<U0064><U0065>"
% deu
Modified: fsf/trunk/libc/localedata/locales/de_DE
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_DE (original)
+++ fsf/trunk/libc/localedata/locales/de_DE Sat Nov 23 00:01:55 2013
@@ -194,6 +194,7 @@
country_num 276
country_car "<U0044>"
country_isbn 3
+% Deutsch
lang_name "<U0044><U0065><U0075><U0074><U0073><U0063><U0068>"
% de
lang_ab "<U0064><U0065>"
Modified: fsf/trunk/libc/localedata/locales/de_LU
==============================================================================
--- fsf/trunk/libc/localedata/locales/de_LU (original)
+++ fsf/trunk/libc/localedata/locales/de_LU Sat Nov 23 00:01:55 2013
@@ -157,6 +157,8 @@
country_num 442
% L
country_car "<U004C>"
+% Deutsch
+lang_name "<U0044><U0065><U0075><U0074><U0073><U0063><U0068>"
% de
lang_ab "<U0064><U0065>"
% deu
Modified: fsf/trunk/libc/localedata/locales/en_AG
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_AG (original)
+++ fsf/trunk/libc/localedata/locales/en_AG Sat Nov 23 00:01:55 2013
@@ -85,6 +85,8 @@
country_ab2 "<U0041><U0047>"
country_ab3 "<U0041><U0054><U0047>"
country_num 28
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/en_AU
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_AU (original)
+++ fsf/trunk/libc/localedata/locales/en_AU Sat Nov 23 00:01:55 2013
@@ -157,6 +157,8 @@
country_ab2 "<U0041><U0055>"
country_ab3 "<U0041><U0055><U0053>"
country_num 036
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% AUS
country_car "<U0041><U0055><U0053>"
% en
Modified: fsf/trunk/libc/localedata/locales/en_BW
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_BW (original)
+++ fsf/trunk/libc/localedata/locales/en_BW Sat Nov 23 00:01:55 2013
@@ -116,6 +116,8 @@
country_num 072
% RB
country_car "<U0052><U0042>"
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/en_CA
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_CA (original)
+++ fsf/trunk/libc/localedata/locales/en_CA Sat Nov 23 00:01:55 2013
@@ -181,6 +181,7 @@
country_num 124
% CDN
country_car "<U0043><U0044><U004E>"
+% English
lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
Modified: fsf/trunk/libc/localedata/locales/en_DK
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_DK (original)
+++ fsf/trunk/libc/localedata/locales/en_DK Sat Nov 23 00:01:55 2013
@@ -161,6 +161,8 @@
country_num 208
% DK
country_car "<U0044><U004B>"
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/en_GB
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_GB (original)
+++ fsf/trunk/libc/localedata/locales/en_GB Sat Nov 23 00:01:55 2013
@@ -164,6 +164,8 @@
country_num 826
% GB
country_car "<U0047><U0042>"
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/en_HK
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_HK (original)
+++ fsf/trunk/libc/localedata/locales/en_HK Sat Nov 23 00:01:55 2013
@@ -198,6 +198,8 @@
country_num 344
% HK
country_car "<U0048><U004B>"
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/en_IE
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_IE (original)
+++ fsf/trunk/libc/localedata/locales/en_IE Sat Nov 23 00:01:55 2013
@@ -157,6 +157,8 @@
country_num 372
% IRL
country_car "<U0049><U0052><U004C>"
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/en_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_IN (original)
+++ fsf/trunk/libc/localedata/locales/en_IN Sat Nov 23 00:01:55 2013
@@ -193,6 +193,8 @@
country_num 356
% IND
country_car "<U0049><U004E><U0044>"
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/en_NZ
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_NZ (original)
+++ fsf/trunk/libc/localedata/locales/en_NZ Sat Nov 23 00:01:55 2013
@@ -158,6 +158,8 @@
country_num 554
% NZ
country_car "<U004E><U005A>"
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/en_PH
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_PH (original)
+++ fsf/trunk/libc/localedata/locales/en_PH Sat Nov 23 00:01:55 2013
@@ -194,6 +194,8 @@
country_num 360
% RP
country_car "<U0052><U0050>"
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/en_SG
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_SG (original)
+++ fsf/trunk/libc/localedata/locales/en_SG Sat Nov 23 00:01:55 2013
@@ -197,6 +197,8 @@
country_num 702
% SGP
country_car "<U0053><U0047><U0050>"
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/en_US
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_US (original)
+++ fsf/trunk/libc/localedata/locales/en_US Sat Nov 23 00:01:55 2013
@@ -165,6 +165,7 @@
% USA
country_car "<U0055><U0053><U0041>"
country_isbn 0
+% English
lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
Modified: fsf/trunk/libc/localedata/locales/en_ZM
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_ZM (original)
+++ fsf/trunk/libc/localedata/locales/en_ZM Sat Nov 23 00:01:55 2013
@@ -88,6 +88,8 @@
country_num 894
% Z
country_car "<U005A>"
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/en_ZW
==============================================================================
--- fsf/trunk/libc/localedata/locales/en_ZW (original)
+++ fsf/trunk/libc/localedata/locales/en_ZW Sat Nov 23 00:01:55 2013
@@ -115,6 +115,8 @@
country_num 716
% ZW
country_car "<U005A><U0057>"
+% English
+lang_name "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
% en
lang_ab "<U0065><U006E>"
% eng
Modified: fsf/trunk/libc/localedata/locales/es_AR
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_AR (original)
+++ fsf/trunk/libc/localedata/locales/es_AR Sat Nov 23 00:01:55 2013
@@ -158,6 +158,8 @@
country_num 032
% RA
country_car "<U0052><U0041>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_BO
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_BO (original)
+++ fsf/trunk/libc/localedata/locales/es_BO Sat Nov 23 00:01:55 2013
@@ -156,6 +156,8 @@
country_num 068
% BOL
country_car "<U0042><U004F><U004C>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_CL
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_CL (original)
+++ fsf/trunk/libc/localedata/locales/es_CL Sat Nov 23 00:01:55 2013
@@ -154,6 +154,8 @@
country_num 152
% RCH
country_car "<U0052><U0043><U0048>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_CO
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_CO (original)
+++ fsf/trunk/libc/localedata/locales/es_CO Sat Nov 23 00:01:55 2013
@@ -157,6 +157,8 @@
country_num 170
% CO
country_car "<U0043><U004F>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_CR
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_CR (original)
+++ fsf/trunk/libc/localedata/locales/es_CR Sat Nov 23 00:01:55 2013
@@ -159,6 +159,7 @@
country_ab2 "<U0043><U0052>"
country_ab3 "<U0043><U0052><U0049>"
country_num 188
+% EspaÃÂol
lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
Modified: fsf/trunk/libc/localedata/locales/es_CU
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_CU (original)
+++ fsf/trunk/libc/localedata/locales/es_CU Sat Nov 23 00:01:55 2013
@@ -121,6 +121,8 @@
country_num 192
% C
country_car "<U0043>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_DO
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_DO (original)
+++ fsf/trunk/libc/localedata/locales/es_DO Sat Nov 23 00:01:55 2013
@@ -158,6 +158,8 @@
country_num 214
% DOM
country_car "<U0044><U004F><U004D>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_EC
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_EC (original)
+++ fsf/trunk/libc/localedata/locales/es_EC Sat Nov 23 00:01:55 2013
@@ -156,6 +156,8 @@
country_num 218
% EC
country_car "<U0045><U0043>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_ES
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_ES (original)
+++ fsf/trunk/libc/localedata/locales/es_ES Sat Nov 23 00:01:55 2013
@@ -170,6 +170,8 @@
country_num 724
% E
country_car "<U0045>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_GT
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_GT (original)
+++ fsf/trunk/libc/localedata/locales/es_GT Sat Nov 23 00:01:55 2013
@@ -155,6 +155,8 @@
country_num 320
% GCA
country_car "<U0047><U0043><U0041>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_HN
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_HN (original)
+++ fsf/trunk/libc/localedata/locales/es_HN Sat Nov 23 00:01:55 2013
@@ -158,6 +158,8 @@
country_num 340
% es
lang_ab "<U0065><U0073>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% spa
lang_term "<U0073><U0070><U0061>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_MX
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_MX (original)
+++ fsf/trunk/libc/localedata/locales/es_MX Sat Nov 23 00:01:55 2013
@@ -155,6 +155,8 @@
country_num 484
% MEX
country_car "<U004D><U0045><U0058>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_NI
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_NI (original)
+++ fsf/trunk/libc/localedata/locales/es_NI Sat Nov 23 00:01:55 2013
@@ -149,6 +149,8 @@
country_num 558
% NIC
country_car "<U004E><U0049><U0043>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_PA
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_PA (original)
+++ fsf/trunk/libc/localedata/locales/es_PA Sat Nov 23 00:01:55 2013
@@ -155,6 +155,8 @@
country_num 591
% PA
country_car "<U0050><U0041>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_PE
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_PE (original)
+++ fsf/trunk/libc/localedata/locales/es_PE Sat Nov 23 00:01:55 2013
@@ -156,6 +156,8 @@
country_num 604
% PE
country_car "<U0050><U0045>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_PR
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_PR (original)
+++ fsf/trunk/libc/localedata/locales/es_PR Sat Nov 23 00:01:55 2013
@@ -144,6 +144,8 @@
country_ab2 "<U0050><U0052>"
country_ab3 "<U0050><U0052><U0049>"
country_num 630
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_PY
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_PY (original)
+++ fsf/trunk/libc/localedata/locales/es_PY Sat Nov 23 00:01:55 2013
@@ -155,6 +155,8 @@
country_num 600
% PY
country_car "<U0050><U0059>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_SV
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_SV (original)
+++ fsf/trunk/libc/localedata/locales/es_SV Sat Nov 23 00:01:55 2013
@@ -156,6 +156,8 @@
country_num 222
% ES
country_car "<U0045><U0053>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_US
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_US (original)
+++ fsf/trunk/libc/localedata/locales/es_US Sat Nov 23 00:01:55 2013
@@ -209,6 +209,8 @@
country_num 840
country_car "<U0055><U0053><U0041>"
country_isbn 0
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_UY
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_UY (original)
+++ fsf/trunk/libc/localedata/locales/es_UY Sat Nov 23 00:01:55 2013
@@ -155,6 +155,8 @@
country_num 858
% UY
country_car "<U0055><U0059>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/es_VE
==============================================================================
--- fsf/trunk/libc/localedata/locales/es_VE (original)
+++ fsf/trunk/libc/localedata/locales/es_VE Sat Nov 23 00:01:55 2013
@@ -155,6 +155,8 @@
country_num 862
% YV
country_car "<U0059><U0056>"
+% EspaÃÂol
+lang_name "<U0045><U0073><U0070><U0061><U00F1><U006F><U006C>"
% es
lang_ab "<U0065><U0073>"
% spa
Modified: fsf/trunk/libc/localedata/locales/fr_BE
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_BE (original)
+++ fsf/trunk/libc/localedata/locales/fr_BE Sat Nov 23 00:01:55 2013
@@ -161,6 +161,8 @@
country_num 056
% B
country_car "<U0042>"
+% FranÃÂais
+lang_name "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
% fr
lang_ab "<U0066><U0072>"
% fra
Modified: fsf/trunk/libc/localedata/locales/fr_CA
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_CA (original)
+++ fsf/trunk/libc/localedata/locales/fr_CA Sat Nov 23 00:01:55 2013
@@ -149,6 +149,7 @@
country_num 124
% CDN
country_car "<U0043><U0044><U004E>"
+% FranÃÂais
lang_name "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
% fr
lang_ab "<U0066><U0072>"
Modified: fsf/trunk/libc/localedata/locales/fr_CH
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_CH (original)
+++ fsf/trunk/libc/localedata/locales/fr_CH Sat Nov 23 00:01:55 2013
@@ -141,6 +141,8 @@
country_num 756
% CH
country_car "<U0043><U0048>"
+% FranÃÂais
+lang_name "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
% fr
lang_ab "<U0066><U0072>"
% fra
Modified: fsf/trunk/libc/localedata/locales/fr_FR
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_FR (original)
+++ fsf/trunk/libc/localedata/locales/fr_FR Sat Nov 23 00:01:55 2013
@@ -180,6 +180,8 @@
country_num 250
% F
country_car "<U0046>"
+% FranÃÂais
+lang_name "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
% fr
lang_ab "<U0066><U0072>"
% fra
Modified: fsf/trunk/libc/localedata/locales/fr_LU
==============================================================================
--- fsf/trunk/libc/localedata/locales/fr_LU (original)
+++ fsf/trunk/libc/localedata/locales/fr_LU Sat Nov 23 00:01:55 2013
@@ -158,6 +158,8 @@
country_num 442
% L
country_car "<U004C>"
+% FranÃÂais
+lang_name "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
% fr
lang_ab "<U0066><U0072>"
% fra
Modified: fsf/trunk/libc/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.arm (original)
+++ fsf/trunk/libc/ports/ChangeLog.arm Sat Nov 23 00:01:55 2013
@@ -1,3 +1,11 @@
+2013-11-22 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * sysdeps/arm/armv7/multiarch/memcpy_impl.S
+ [ARM_ALWAYS_BX] (dispatch_helper): Fix PC computation to properly
+ account for instructions after the reference to PC given that 'bx'
+ might actually be expanded to multiple instructions.
+ * sysdeps/arm/arm-features.h (ARM_BX_NINSNS): Macro removed.
+
2013-10-30 Mike Frysinger <vapier@xxxxxxxxxx>
* sysdeps/arm/configure.in: Moved to ...
Modified: fsf/trunk/libc/ports/sysdeps/arm/arm-features.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/arm/arm-features.h (original)
+++ fsf/trunk/libc/ports/sysdeps/arm/arm-features.h Sat Nov 23 00:01:55 2013
@@ -53,14 +53,6 @@
# define ARM_BX_ALIGN_LOG2 2
#endif
-/* The number of instructions that 'bx' expands to. A more-specific
- arm-features.h that defines 'bx' as a macro should define this to the
- number instructions it expands to. This is used only in a context
- where the 'bx' expansion won't cross an ARM_BX_ALIGN_LOG2 boundary. */
-#ifndef ARM_BX_NINSNS
-# define ARM_BX_NINSNS 1
-#endif
-
/* An OS-specific arm-features.h file may define ARM_NO_INDEX_REGISTER to
indicate that the two-register addressing modes must never be used. */
Modified: fsf/trunk/libc/ports/sysdeps/arm/armv7/multiarch/memcpy_impl.S
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/arm/armv7/multiarch/memcpy_impl.S (original)
+++ fsf/trunk/libc/ports/sysdeps/arm/armv7/multiarch/memcpy_impl.S Sat Nov 23 00:01:55 2013
@@ -127,25 +127,26 @@
.purgem dispatch_step
.endm
#else
-# if ARM_BX_ALIGN_LOG2 < 4
+# if ARM_BX_ALIGN_LOG2 < 3
# error case not handled
# endif
.macro dispatch_helper steps, log2_bytes_per_step
- .p2align ARM_BX_ALIGN_LOG2
/* TMP1 gets (max_bytes - bytes_to_copy), where max_bytes is
(STEPS << LOG2_BYTES_PER_STEP).
- So this is (steps_to_skip << LOG2_BYTES_PER_STEP). */
- rsb tmp1, tmp1, #(\steps << \log2_bytes_per_step)
- /* Pad so that the add;bx pair immediately precedes an alignment
- boundary. Hence, TMP1=0 will run all the steps. */
- .rept (1 << (ARM_BX_ALIGN_LOG2 - 2)) - (2 + ARM_BX_NINSNS)
- nop
- .endr
+ So this is (steps_to_skip << LOG2_BYTES_PER_STEP).
+ Then it needs further adjustment to compensate for the
+ distance between the PC value taken below (0f + PC_OFS)
+ and the first step's instructions (1f). */
+ rsb tmp1, tmp1, #((\steps << \log2_bytes_per_step) \
+ + ((1f - PC_OFS - 0f) \
+ >> (ARM_BX_ALIGN_LOG2 - \log2_bytes_per_step)))
/* Shifting down LOG2_BYTES_PER_STEP gives us the number of
steps to skip, then shifting up ARM_BX_ALIGN_LOG2 gives us
the (byte) distance to add to the PC. */
- add tmp1, pc, tmp1, lsl #(ARM_BX_ALIGN_LOG2 - \log2_bytes_per_step)
+0: add tmp1, pc, tmp1, lsl #(ARM_BX_ALIGN_LOG2 - \log2_bytes_per_step)
bx tmp1
+ .p2align ARM_BX_ALIGN_LOG2
+1:
.endm
.macro dispatch_7_dword
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits