Update.

2000-06-25  Greg McGary  <greg@mcgary.org>

	* sysdeps/i386/i586/memcpy.S: Redefine memcpy as mempcpy,
	not as bcopy.

1 files changed, 155 insertions, 77 deletions

diff --git a/localedata/locales/en_US b/localedata/locales/en_US
index c95365cf59..7548631162 100644
--- a/localedata/locales/en_US
+++ b/localedata/locales/en_US
@@ -1,95 +1,173 @@
-escape_char  /
-comment_char  %
-repertoiremap mnemonic.ds
-
-% English language locale for USA
-% Source: RAP
-% Address: Sankt Jo//rgens Alle 8
-%    DK-1615 Ko//benhavn V, Danmark
-% Contact: Keld Simonsen
-% Email: Keld.Simonsen@dkuug.dk
-% Tel: +45 - 31226543
-% Fax: +45 - 33256543
-% Language: en
-% Territory: US
-% Revision: 4.4
-% Date: 1997-11-05
-% Users: general
-% Repertoiremap: mnemonic.ds
-% Charset: ISO-8859-1
-% Distribution and use is free, also
-% for commercial purposes.
+escape_char /
+comment_char %
+% Locale for English locale in the USA
+% Contributed by Ulrich Drepper <drepper@redhat.com>, 2000
+
+LC_IDENTIFICATION
+title      "English locale for the USA"
+source     "Free Software Foundation, Inc."
+address    "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA"
+contact    ""
+email      "bug-glibc@gnu.org"
+tel        ""
+fax        ""
+language   "English"
+territory  "USA"
+revision   "1.0"
+date       "2000-06-24"
+%
+category  "en_US:2000";LC_IDENTIFICATION
+category  "en_US:2000";LC_CTYPE
+category  "en_US:2000";LC_COLLATE
+category  "en_US:2000";LC_TIME
+category  "en_US:2000";LC_NUMERIC
+category  "en_US:2000";LC_MONETARY
+category  "en_US:2000";LC_MESSAGES
+category  "en_US:2000";LC_PAPER
+category  "en_US:2000";LC_NAME
+category  "en_US:2000";LC_ADDRESS
+category  "en_US:2000";LC_TELEPHONE
+
+END LC_IDENTIFICATION
 
 LC_CTYPE
-copy "en_DK"
+copy "i18n"
 END LC_CTYPE
 
 LC_COLLATE
-copy "en_DK"
+
+% Copy the template from ISO/IEC 14651
+copy "iso14651_t1"
+
 END LC_COLLATE
 
 LC_MONETARY
-int_curr_symbol         "<U><S><D><SP>"
-currency_symbol         "<DO>"
-mon_decimal_point       "<.>"
-mon_thousands_sep       "<,>"
-mon_grouping            3;3
-positive_sign           ""
-negative_sign           "<->"
-int_frac_digits         2
-frac_digits             2
-p_cs_precedes           1
-p_sep_by_space          0
-n_cs_precedes           1
-n_sep_by_space          0
-p_sign_posn             1
-n_sign_posn             1
+int_curr_symbol     "<U0055><U0053><U0044><U0020>"
+currency_symbol     "<U0024>"
+mon_decimal_point   "<U002E>"
+mon_thousands_sep   "<U002C>"
+mon_grouping        3;3
+positive_sign       ""
+negative_sign       "<U002D>"
+int_frac_digits     2
+frac_digits         2
+p_cs_precedes       1
+p_sep_by_space      0
+n_cs_precedes       1
+n_sep_by_space      0
+p_sign_posn         1
+n_sign_posn         1
+%
 END LC_MONETARY
 
 LC_NUMERIC
-decimal_point           "<.>"
-thousands_sep           "<,>"
-grouping                3;3
+decimal_point   "<U002E>"
+thousands_sep   "<U002C>"
+grouping        3;3
 END LC_NUMERIC
 
 LC_TIME
-abday       "<S><u><n>";"<M><o><n>";/
-            "<T><u><e>";"<W><e><d>";/
-            "<T><h><u>";"<F><r><i>";/
-            "<S><a><t>"
-day         "<S><u><n><d><a><y>";/
-            "<M><o><n><d><a><y>";/
-            "<T><u><e><s><d><a><y>";/
-            "<W><e><d><n><e><s><d><a><y>";/
-            "<T><h><u><r><s><d><a><y>";/
-            "<F><r><i><d><a><y>";/
-            "<S><a><t><u><r><d><a><y>"
-abmon       "<J><a><n>";"<F><e><b>";/
-            "<M><a><r>";"<A><p><r>";/
-            "<M><a><y>";"<J><u><n>";/
-            "<J><u><l>";"<A><u><g>";/
-            "<S><e><p>";"<O><c><t>";/
-            "<N><o><v>";"<D><e><c>"
-mon         "<J><a><n><u><a><r><y>";/
-            "<F><e><b><r><u><a><r><y>";/
-            "<M><a><r><c><h>";/
-            "<A><p><r><i><l>";/
-            "<M><a><y>";/
-            "<J><u><n><e>";/
-            "<J><u><l><y>";/
-            "<A><u><g><u><s><t>";/
-            "<S><e><p><t><e><m><b><e><r>";/
-            "<O><c><t><o><b><e><r>";/
-            "<N><o><v><e><m><b><e><r>";/
-            "<D><e><c><e><m><b><e><r>"
-d_t_fmt     "<%><a><SP><%><d><SP><%><b><SP><%><Y><SP><%><r><SP><%><Z>"
-d_fmt       "<%><m><//><%><d><//><%><y>"
-t_fmt       "<%><r>"
-am_pm       "<A><M>";"<P><M>"
-t_fmt_ampm  "<%><I><:><%><M><:><%><S><SP><%><p>"
+abday	"<U0053><U0075><U006E>";"<U004D><U006F><U006E>";/
+	"<U0054><U0075><U0065>";"<U0057><U0065><U0064>";/
+	"<U0054><U0068><U0075>";"<U0046><U0072><U0069>";/
+	"<U0053><U0061><U0074>"
+day	"<U0053><U0075><U006E><U0064><U0061><U0079>";/
+	"<U004D><U006F><U006E><U0064><U0061><U0079>";/
+	"<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";/
+	"<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";/
+	"<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";/
+	"<U0046><U0072><U0069><U0064><U0061><U0079>";/
+	"<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>"
+
+week    7;19971201;4
+abmon	"<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
+	"<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/
+	"<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/
+	"<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/
+	"<U0053><U0065><U0070>";"<U004F><U0063><U0074>";/
+	"<U004E><U006F><U0076>";"<U0044><U0065><U0063>"
+mon	"<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
+	"<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";/
+	"<U004D><U0061><U0072><U0063><U0068>";/
+	"<U0041><U0070><U0072><U0069><U006C>";/
+	"<U004D><U0061><U0079>";/
+	"<U004A><U0075><U006E><U0065>";/
+	"<U004A><U0075><U006C><U0079>";/
+	"<U0041><U0075><U0067><U0075><U0073><U0074>";/
+	"<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/
+	"<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/
+	"<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
+	"<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>"
+am_pm   "";""
+% Appropriate date and time representation (%c)
+%	"%a %d %b %Y %r %Z"
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0072><U0020><U0025><U005A>"
+%
+% Appropriate date representation (%x)
+%	"%m/%d/%Y"
+d_fmt   "<U0025><U006D><U002F><U0025><U0064><U002F><U0025><U0059>"
+%
+% Appropriate time representation (%X)
+%	"%r"
+t_fmt   "<U0025><U0072>"
+%
+% Appropriate AM/PM time representation (%r)
+%	"%I:%M:%S %p"
+t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U0070>"
+%
+% Strings for AM/PM
+%
+am_pm	"<U0041><U004D>";"<U0050><U004D>"
 END LC_TIME
 
 LC_MESSAGES
-yesexpr     "<'/>><<(><y><Y><s><S><)/>><.><*>"
-noexpr      "<'/>><<(><n><N><)/>><.><*>"
+yesexpr "<U005E><U005B><U0079><U0059><U005D><U002E><U002A>"
+noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
 END LC_MESSAGES
+
+LC_PAPER
+height   279
+width    216
+END LC_PAPER
+
+LC_NAME
+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
+<U0025><U006D><U0025><U0074><U0025><U0066>"
+name_miss   "<U004D><U0069><U0073><U0073><U002E>"
+name_mr     "<U004D><U0072><U002E>"
+name_mrs    "<U004D><U0072><U0073><U002E>"
+name_ms     "<U004D><U0073><U002E>"
+END LC_NAME
+
+
+LC_ADDRESS
+postal_fmt    "<U0025><U0061><U0025><U004E><U0025><U0066><U0025><U004E>/
+<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0068>/
+<U0020><U0025><U0073><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+<U004E><U0025><U0025><U0054><U0020><U0025><U007A><U0025>/
+<U004E><U0025><U0063><U0025><U004E>"
+country_name  "<U0055><U0053><U0041>"
+country_post  "<U0055><U0053><U0041>"
+country_ab2   "<U0055><U0053>"
+country_ab3   "<U0055><U0053><U0041>"
+country_num   840
+country_car   "<U0055><U0053><U0041>"
+country_isbn  0
+lang_name     "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
+lang_ab       "<U0065><U006E>"
+lang_term     "<U0065><U006E><U0067>"
+lang_lib      "<U0065><U006E><U0067>"
+END LC_ADDRESS
+
+LC_TELEPHONE
+tel_int_fmt    "<U002B><U0025><U0063><U0020><U0028><U0025><U0061><U0029>/
+<U0020><U0025><U006C>"
+tel_dom_fmt    "<U0028><U0025><U0061><U0029><U0020><U0025><U006C>"
+int_select     "<U0031><U0031>"
+int_prefix     "<U0031>"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+measurement    2
+END LC_MEASUREMENT