Update.

2003-06-16  Ulrich Drepper  <drepper@redhat.com>

	* elf/rtld.c (dl_main): Use l_map_start not l_addr in Phdr
	computation so that prelinking wroks.

	* inet/netinet/ip6.h (IP6OPT_PAD1, IP6OPT_PADN): Define.

2 files changed, 155 insertions, 29 deletions

diff --git a/localedata/locales/an_ES b/localedata/locales/an_ES
new file mode 100644
index 0000000000..30eafaf741
--- /dev/null
+++ b/localedata/locales/an_ES
@@ -0,0 +1,126 @@
+comment_char %
+escape_char  /
+%
+% Aragonese Language Locale for Spain
+% Source:
+% Address:
+% Contact: Jordi Mallach Pérez
+% Email: jordi@gnu.org
+% Language: an
+% Territory: ES
+% Revision: 1.0
+% Date: 2003-05-22
+% Application: general
+% Users: general
+% Charset: ISO-8859-1
+%
+% This file is under the
+% GNU General Public License.
+% Based in the gl_ES Locale
+
+LC_IDENTIFICATION
+title      "Aragonese locale for Spain"
+source     ""
+address    ""
+contact    "Jordi Mallach Pérez"
+email      "bug-glibc@gnu.org"
+tel        ""
+fax        ""
+language   "an"
+territory  "ES"
+revision   "1.0"
+date       "2003-06-15"
+%
+category  "i18n:1999";LC_IDENTIFICATION
+category  "i18n:1999";LC_CTYPE
+category  "i18n:1999";LC_COLLATE
+category  "i18n:1999";LC_TIME
+category  "posix:1993";LC_NUMERIC
+category  "i18n:1999";LC_MONETARY
+category  "i18n:1999";LC_MESSAGES
+category  "i18n:1999";LC_PAPER
+category  "i18n:1999";LC_NAME
+category  "i18n:1999";LC_ADDRESS
+category  "i18n:1999";LC_TELEPHONE
+END LC_IDENTIFICATION
+
+LC_COLLATE
+copy "es_ES"
+END LC_COLLATE
+
+LC_CTYPE
+copy "es_ES"
+END LC_CTYPE
+
+LC_MESSAGES
+yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
+noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
+END LC_MESSAGES
+
+LC_MONETARY
+copy "es_ES"
+END LC_MONETARY
+
+LC_NUMERIC
+copy "es_ES"
+END LC_NUMERIC
+
+LC_TIME
+abday   "<U0064><U006F><U006D>";"<U006C><U0075><U006E>";/
+        "<U006D><U0061><U0072>";"<U006D><U0069><U0065>";/
+        "<U0063><U0068><U0075>";"<U0062><U0069><U0065>";/
+        "<U0073><U0061><U0062>"
+day     "<U0064><U006F><U006D><U0069><U006E><U0067><U006F>";/
+        "<U006C><U0075><U006E><U0073>";/
+        "<U006D><U0061><U0072><U0074><U0065><U0073>";/
+        "<U006D><U0069><U0065><U0063><U006F><U006c><U0073>";/
+        "<U0063><U0068><U0075><U0065><U0062><U0065><U0073>";/
+        "<U0062><U0069><U0065><U0072><U006E><U0065><U0073>";/
+        "<U0073><U0061><U0062><U0061><U0064><U006F>"
+abmon   "<U0063><U0068><U0069>";"<U0066><U0072><U0065>";/
+        "<U006D><U0061><U0072>";"<U0061><U0062><U0072>";/
+        "<U006D><U0061><U0079>";"<U0063><U0068><U006E>";/
+        "<U0063><U0068><U006C>";"<U0061><U0067><U006F>";/
+        "<U0073><U0065><U0074>";"<U006f><U0063><U0074>";/
+        "<U006E><U006F><U0062>";"<U0061><U0062><U0069>"
+mon     "<U0063><U0068><U0069><U006E><U0065><U0072><U006F>";/
+        "<U0066><U0072><U0065><U0062><U0065><U0072><U006F>";/
+        "<U006D><U0061><U0072><U007A><U006F>";/
+        "<U0061><U0062><U0072><U0069><U006C>";/
+        "<U006D><U0061><U0079><U006F>";/
+        "<U0063><U0068><U0075><U006E><U0069><U006F>";/
+        "<U0063><U0068><U0075><U006C><U0069><U006F>";/
+        "<U0061><U0067><U006F><U0073><U0074><U006F>";/
+        "<U0073><U0065><U0074><U0069><U0065><U006D><U0062><U0072><U0065>";/
+        "<U006F><U0063><U0074><U0075><U0062><U0072><U0065>";/
+        "<U006E><U006F><U0062><U0069><U0065><U006D><U0062><U0072><U0065>";/
+        "<U0061><U0062><U0069><U0065><U006E><U0074><U006F>"
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
+t_fmt   "<U0025><U0054>"
+am_pm   "";""
+t_fmt_ampm ""
+date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U005A><U0020><U0025><U0059>"
+END LC_TIME
+
+LC_PAPER
+copy "es_ES"
+END LC_PAPER
+
+LC_TELEPHONE
+copy "es_ES"
+END LC_TELEPHONE
+
+LC_MEASUREMENT
+copy "es_ES"
+END LC_MEASUREMENT
+
+LC_NAME
+copy "es_ES"
+END LC_NAME
+
+LC_ADDRESS
+copy "es_ES"
+END LC_ADDRESS
diff --git a/localedata/locales/is_IS b/localedata/locales/is_IS
index a62aa35f11..d2da32b61b 100644
--- a/localedata/locales/is_IS
+++ b/localedata/locales/is_IS
@@ -2185,35 +2185,35 @@ grouping                3;3
 END LC_NUMERIC
 
 LC_TIME
-abday "<U0053><U0075><U006E>";"<U004D><U00E1><U006E>";/
-      "<U00DE><U0072><U0069>";"<U004D><U0069><U00F0>";/
-      "<U0046><U0069><U006D>";"<U0046><U00F6><U0073>";/
-      "<U004C><U0061><U0075>"
-day   "<U0053><U0075><U006E><U006E><U0075><U0064><U0061><U0067><U0075><U0072>";/
-      "<U004D><U00E1><U006E><U0075><U0064><U0061><U0067><U0075><U0072>";/
-      "<U00DE><U0072><U0069><U00F0><U006A><U0075><U0064><U0061><U0067><U0075><U0072>";/
-      "<U004D><U0069><U00F0><U0076><U0069><U006B><U0075><U0064><U0061><U0067><U0075><U0072>";/
-      "<U0046><U0069><U006D><U006D><U0074><U0075><U0064><U0061><U0067><U0075><U0072>";/
-      "<U0046><U00F6><U0073><U0074><U0075><U0064><U0061><U0067><U0075><U0072>";/
-      "<U004C><U0061><U0075><U0067><U0061><U0072><U0064><U0061><U0067><U0075><U0072>"
-abmon "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
-      "<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/
-      "<U004D><U0061><U00ED>";"<U004A><U00FA><U006E>";/
-      "<U004A><U00FA><U006C>";"<U00C1><U0067><U00FA>";/
-      "<U0053><U0065><U0070>";"<U004F><U006B><U0074>";/
-      "<U004E><U00F3><U0076>";"<U0044><U0065><U0073>"
-mon   "<U004A><U0061><U006E><U00FA><U0061><U0072>";/
-      "<U0046><U0065><U0062><U0072><U00FA><U0061><U0072>";/
-      "<U004D><U0061><U0072><U0073>";/
-      "<U0041><U0070><U0072><U00ED><U006C>";/
-      "<U004D><U0061><U00ED>";/
-      "<U004A><U00FA><U006E><U00ED>";/
-      "<U004A><U00FA><U006C><U00ED>";/
-      "<U00C1><U0067><U00FA><U0073><U0074>";/
-      "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/
-      "<U004F><U006B><U0074><U00F3><U0062><U0065><U0072>";/
-      "<U004E><U00F3><U0076><U0065><U006D><U0062><U0065><U0072>";/
-      "<U0044><U0065><U0073><U0065><U006D><U0062><U0065><U0072>"
+abday "<U0073><U0075><U006E>";"<U006D><U00E1><U006E>";/
+      "<U00FE><U0072><U0069>";"<U006D><U0069><U00F0>";/
+      "<U0066><U0069><U006D>";"<U0066><U00F6><U0073>";/
+      "<U006C><U0061><U0075>"
+day   "<U0073><U0075><U006E><U006E><U0075><U0064><U0061><U0067><U0075><U0072>";/
+      "<U006D><U00E1><U006E><U0075><U0064><U0061><U0067><U0075><U0072>";/
+      "<U00FE><U0072><U0069><U00F0><U006A><U0075><U0064><U0061><U0067><U0075><U0072>";/
+      "<U006D><U0069><U00F0><U0076><U0069><U006B><U0075><U0064><U0061><U0067><U0075><U0072>";/
+      "<U0066><U0069><U006D><U006D><U0074><U0075><U0064><U0061><U0067><U0075><U0072>";/
+      "<U0066><U00F6><U0073><U0074><U0075><U0064><U0061><U0067><U0075><U0072>";/
+      "<U006C><U0061><U0075><U0067><U0061><U0072><U0064><U0061><U0067><U0075><U0072>"
+abmon "<U006A><U0061><U006E>";"<U0066><U0065><U0062>";/
+      "<U006D><U0061><U0072>";"<U0061><U0070><U0072>";/
+      "<U006D><U0061><U00ED>";"<U006A><U00FA><U006E>";/
+      "<U006A><U00FA><U006C>";"<U00E1><U0067><U00FA>";/
+      "<U0073><U0065><U0070>";"<U006F><U006B><U0074>";/
+      "<U006E><U00F3><U0076>";"<U0064><U0065><U0073>"
+mon   "<U006A><U0061><U006E><U00FA><U0061><U0072>";/
+      "<U0066><U0065><U0062><U0072><U00FA><U0061><U0072>";/
+      "<U006D><U0061><U0072><U0073>";/
+      "<U0061><U0070><U0072><U00ED><U006C>";/
+      "<U006D><U0061><U00ED>";/
+      "<U006A><U00FA><U006E><U00ED>";/
+      "<U006A><U00FA><U006C><U00ED>";/
+      "<U00E1><U0067><U00FA><U0073><U0074>";/
+      "<U0073><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/
+      "<U006F><U006B><U0074><U00F3><U0062><U0065><U0072>";/
+      "<U006E><U00F3><U0076><U0065><U006D><U0062><U0065><U0072>";/
+      "<U0064><U0065><U0073><U0065><U006D><U0062><U0065><U0072>"
 d_t_fmt "<U0025><U0061><U0020><U0025><U0065><U002E><U0025><U0062><U0020><U0025><U0059><U002C><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt   "<U0025><U0061><U0020><U0025><U0065><U002E><U0025><U0062><U0020><U0025><U0059>"
 t_fmt   "<U0025><U0054>"