Update.

1999-09-13  Ulrich Drepper  <drepper@cygnus.com>

	* locale/langinfo.h: Remove byte-order dependent names.
	* locale/categories.def: Update after removal of byte-order dependent
	names.
	* locale/loadlocale.c (_nl_load_locale): Don't allow locale files
	with magic number in other byte order.
	* locale/newlocale.c (__newlocale): Remove byte-order dependent code.
	* locale/C-collate.c: Remove initializers for other byte-order.
	* locale/C-ctype.c: Likewise.
	* locale/C-monetary.c: Likewise.
	* locale/C-paper.c: Likewise.
	* locale/C-time.c: Likewise.
	* locale/lc-collate.c: Remove byte-order oriented initialization.
	* locale/lc-ctype.c: Likewise.
	* locale/lc-monetary.c: Likewise.
	* locale/lc-time.c: Likewise.
	* locale/programs/ld-address.c: Don't generate output in both
	byte-orders.
	* locale/programs/ld-ctype.c: Likewise.
	* locale/programs/ld-paper.c: Likewise.
	* locale/programs/ld-time.c: Likewise.
	* time/strftime.c (NLW): Don't use different byte-orders.
	* wctype/cname-lookup.h (cname_lookup): Likewise.

	* Makeconfig (localedir): Define using libdir, not datadir.
	(msgcatdir): New variable.
	* catgets/Makefile (CPPFLAGS): Define NLSPATH using msgcatdir.
	* elf/Makefile (bash-ldd-rewrite): Replace @TEXTDOMAINDIR@ using
	msgcatdir.
	* intl/Makefile (install-others): Install locale.alias in msgcatdir.
	(CPPFLAGS): Define paths using msgcatdir.
	* locale/Makefile (CPPFLAGS): Define LOCALE_ALIAS_PATH using msgcatdir.
	* po/Makefile (mo-installed): Define using msgcatdir.

	* sysdeps/unix/sysv/linux/net/if_arp.h: Fix typo.

31 files changed, 363 insertions, 1268 deletions

diff --git a/BUGS b/BUGS
index 2f44568200..53edfecc14 100644
--- a/BUGS
+++ b/BUGS
@@ -1,7 +1,7 @@
 	    List of known bugs (certainly very incomplete)
 	    ----------------------------------------------
 
-Time-stamp: <1999-07-29T15:25:53-0700 drepper>
+Time-stamp: <1999-09-13T02:02:34-0700 drepper>
 
 This following list contains those bugs which I'm aware of.  Please
 make sure that bugs you report are not listed here.  If you can fix one
@@ -39,26 +39,12 @@ Severity: [  *] to [***]
        symbols in <linux/limits.h> available.
        [PR libc/140]
 
-[  *]  The localedef program should not generate errors if for categories
-       which are not used for the output there are characters referenced
-       which are not defined in the charmap.
-       [PR libc/229]
-
-[  *]  When assembling a locale definition, that uses the "copy"
-       directive, with localedef, not only the copied category is
-       checked for errors, but the whole file containing the same
-       category.
-       [PR libc/207 and PR libc/454]
-
 [  *]  The libm-ieee `gamma' function gives wrong results (at least for
        -0.5).
 
 [  *]  The libm-ieee `scalb' function gives wrong results for
        non-integral second parameters.
 
-[  *]  The strftime() implementation cannot handle multibyte locales really
-       good since the TOLOWER and TOUPPER are not prepared.
-
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Ulrich Drepper
 drepper@cygnus.com
diff --git a/ChangeLog b/ChangeLog
index eed31e6480..2b63f1ee36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+1999-09-13  Ulrich Drepper  <drepper@cygnus.com>
+
+	* locale/langinfo.h: Remove byte-order dependent names.
+	* locale/categories.def: Update after removal of byte-order dependent
+	names.
+	* locale/loadlocale.c (_nl_load_locale): Don't allow locale files
+	with magic number in other byte order.
+	* locale/newlocale.c (__newlocale): Remove byte-order dependent code.
+	* locale/C-collate.c: Remove initializers for other byte-order.
+	* locale/C-ctype.c: Likewise.
+	* locale/C-monetary.c: Likewise.
+	* locale/C-paper.c: Likewise.
+	* locale/C-time.c: Likewise.
+	* locale/lc-collate.c: Remove byte-order oriented initialization.
+	* locale/lc-ctype.c: Likewise.
+	* locale/lc-monetary.c: Likewise.
+	* locale/lc-time.c: Likewise.
+	* locale/programs/ld-address.c: Don't generate output in both
+	byte-orders.
+	* locale/programs/ld-ctype.c: Likewise.
+	* locale/programs/ld-paper.c: Likewise.
+	* locale/programs/ld-time.c: Likewise.
+	* time/strftime.c (NLW): Don't use different byte-orders.
+	* wctype/cname-lookup.h (cname_lookup): Likewise.
+
+	* Makeconfig (localedir): Define using libdir, not datadir.
+	(msgcatdir): New variable.
+	* catgets/Makefile (CPPFLAGS): Define NLSPATH using msgcatdir.
+	* elf/Makefile (bash-ldd-rewrite): Replace @TEXTDOMAINDIR@ using
+	msgcatdir.
+	* intl/Makefile (install-others): Install locale.alias in msgcatdir.
+	(CPPFLAGS): Define paths using msgcatdir.
+	* locale/Makefile (CPPFLAGS): Define LOCALE_ALIAS_PATH using msgcatdir.
+	* po/Makefile (mo-installed): Define using msgcatdir.
+
+	* sysdeps/unix/sysv/linux/net/if_arp.h: Fix typo.
+
 1999-09-12  Ulrich Drepper  <drepper@cygnus.com>
 
 	* stdio-common/vfprintf.c: Remove limitation on size of precision
diff --git a/Makeconfig b/Makeconfig
index fb11c28691..7bee724e1a 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -205,13 +205,19 @@ zonedir = $(datadir)/zoneinfo
 endif
 inst_zonedir = $(install_root)$(zonedir)
 
-# Where to install the locale and message catalog data files (which are
-# machine-independent).
+# Where to install the locale files.
 ifndef localedir
-localedir = $(datadir)/locale
+localedir = $(libdir)/locale
 endif
 inst_localedir = $(install_root)$(localedir)
 
+# Where to install the message catalog data files (which are
+# machine-independent).
+ifndef msgcatdir
+msgcatdir = $(datadir)/locale
+endif
+inst_msgcatdir = $(install_root)$(msgcatdir)
+
 # Where to install the locale charmap source files.
 ifndef i18ndir
 i18ndir = $(datadir)/i18n
diff --git a/catgets/Makefile b/catgets/Makefile
index e984ff724b..9ddc59dc7d 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -38,7 +38,7 @@ include ../Rules
 
 $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o)
 
-CPPFLAGS := -DNLSPATH='"$(localedir)/%L/%N:$(localedir)/%L/LC_MESSAGES/%N:$(localedir)/%l/%N:$(localedir)/%l/LC_MESSAGES/%N:"' \
+CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \
 	    -DHAVE_CONFIG_H $(CPPFLAGS)
 
 generated = de.msg de.cat test1.cat test1.h
diff --git a/elf/Makefile b/elf/Makefile
index 4f532d3fb5..c93e3eb1f3 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -165,7 +165,7 @@ common-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \
 		     -e 's%@VERSION@%$(version)%g'
 sh-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%/bin/sh%g;s/\$$"/"/g'
 bash-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%$(BASH)%g' \
-		   -e 's%@TEXTDOMAINDIR@%$(localedir)%g'
+		   -e 's%@TEXTDOMAINDIR@%$(msgcatdir)%g'
 
 ifneq ($(have-bash2),yes)
 ldd-shell = sh
diff --git a/elf/link.h b/elf/link.h
index e8203596ff..ac53a204a6 100644
--- a/elf/link.h
+++ b/elf/link.h
@@ -69,7 +69,7 @@ extern struct r_debug _r_debug;
 /* This symbol refers to the "dynamic structure" in the `.dynamic' section
    of whatever module refers to `_DYNAMIC'.  So, to find its own
    `struct r_debug', a program could do:
-     for (dyn = _DYNAMIC; dyn->d_tag != DT_NULL)
+     for (dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn)
        if (dyn->d_tag == DT_DEBUG)
 	 r_debug = (struct r_debug *) dyn->d_un.d_ptr;
    */
diff --git a/intl/Makefile b/intl/Makefile
index c6d58dadad..4712179290 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -25,14 +25,14 @@ routines = bindtextdom dcgettext dgettext gettext	\
 	   l10nflist explodename
 distribute = gettext.h gettextP.h hash-string.h loadinfo.h locale.alias
 
-install-others = $(inst_localedir)/locale.alias
+install-others = $(inst_msgcatdir)/locale.alias
 
 include ../Rules
 
-CPPFLAGS += -D'GNULOCALEDIR="$(localedir)"' \
-	    -D'LOCALE_ALIAS_PATH="$(localedir):$(i18ndir)"'
+CPPFLAGS += -D'GNULOCALEDIR="$(msgcatdir)"' \
+	    -D'LOCALE_ALIAS_PATH="$(msgcatdir):$(i18ndir)"'
 
-$(inst_localedir)/locale.alias: locale.alias $(+force)
+$(inst_msgcatdir)/locale.alias: locale.alias $(+force)
 	$(do-install)
 
 ifdef gettext-srcdir
diff --git a/locale/C-collate.c b/locale/C-collate.c
index 616fed1e3a..6fd0e721be 100644
--- a/locale/C-collate.c
+++ b/locale/C-collate.c
@@ -148,7 +148,7 @@ const struct locale_data _nl_C_LC_COLLATE =
   _nl_C_name,
   NULL, 0, 0, /* no file mapped */
   UNDELETABLE,
-  21,
+  30,
   {
     { word: 0 },
     { string: NULL },
@@ -175,22 +175,10 @@ const struct locale_data _nl_C_LC_COLLATE =
     { string: NULL },
     { string: NULL },
     { word: 223 },
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-    { string: NULL },
-#endif
     { string: (const char *) _nl_C_LC_COLLATE_symbol_hash },
-#if __BYTE_ORDER == __BIG_ENDIAN
-    { string: NULL },
-#endif
     { string: _nl_C_LC_COLLATE_symbol_strings },
     { string: NULL },
     { string: NULL },
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-    { string: NULL },
-#endif
-    { string: (const char *) _nl_C_LC_COLLATE_symbol_classes },
-#if __BYTE_ORDER == __BIG_ENDIAN
-    { string: NULL },
-#endif
+    { string: (const char *) _nl_C_LC_COLLATE_symbol_classes }
   }
 };
diff --git a/locale/C-ctype.c b/locale/C-ctype.c
index f81f5c3ac1..1a1ab5b796 100644
--- a/locale/C-ctype.c
+++ b/locale/C-ctype.c
@@ -343,29 +343,15 @@ const struct locale_data _nl_C_LC_CTYPE =
   _nl_C_name,
   NULL, 0, 0, /* no file mapped */
   UNDELETABLE,
-  15,
+  60,
   {
     { string: _nl_C_LC_CTYPE_class },
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { string: NULL }, { string: NULL },
-#endif
     { string: (const char *) _nl_C_LC_CTYPE_toupper },
     { string: (const char *) _nl_C_LC_CTYPE_tolower },
-#if BYTE_ORDER == BIG_ENDIAN
-    { string: NULL }, { string: NULL },
-#endif
     { string: _nl_C_LC_CTYPE_class32 },
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { string: NULL },
-#endif
     { string: (const char *) _nl_C_LC_CTYPE_names },
-#if BYTE_ORDER == BIG_ENDIAN
-    { string: NULL },
-    { word: 256 }, { word: 1 },
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { word: 0 }, { word: 0 },
-#endif
+    { word: 256 },
+    { word: 1 },
     { string: "upper\0" "lower\0" "alpha\0" "digit\0" "xdigit\0" "space\0"
 	      "print\0" "graph\0" "blank\0" "cntrl\0" "punct\0"  "alnum\0"
 	      "left_to_right\0" "right_to_left\0" "num_terminator\0"
@@ -378,14 +364,7 @@ const struct locale_data _nl_C_LC_CTYPE =
     { string: _nl_C_LC_CTYPE_width },
     { word: 1 },
     { string: "ANSI_X3.4-1968" },
-#if BYTE_ORDER == BIG_ENDIAN
-    { word: 0 }, { word: 0 },
-    { word: 1 }, { word: 0 },
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { word: 256 }, { word: 1 },
-    { word: 0 }, { word: 1 },
-#endif
+    { word: 1 },
     { string: "0" },
     { string: "1" },
     { string: "2" },
@@ -396,24 +375,7 @@ const struct locale_data _nl_C_LC_CTYPE =
     { string: "7" },
     { string: "8" },
     { string: "9" },
-#if BYTE_ORDER == BIG_ENDIAN
-    { word: 1 }, { word: 0 },
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { word: 0 }, { word: 1 },
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-#endif
+    { word: 1 },
     { wstr: (uint32_t *) L"0" },
     { wstr: (uint32_t *) L"1" },
     { wstr: (uint32_t *) L"2" },
@@ -424,18 +386,6 @@ const struct locale_data _nl_C_LC_CTYPE =
     { wstr: (uint32_t *) L"7" },
     { wstr: (uint32_t *) L"8" },
     { wstr: (uint32_t *) L"9" },
-#if BYTE_ORDER == BIG_ENDIAN
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-    { wstr: (uint32_t *) L"" },
-#endif
     { string: "0" },
     { string: "1" },
     { string: "2" },
@@ -446,18 +396,6 @@ const struct locale_data _nl_C_LC_CTYPE =
     { string: "7" },
     { string: "8" },
     { string: "9" },
-#if BYTE_ORDER == LITTLE_ENDIAN
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-#endif
     { word: L'0' },
     { word: L'1' },
     { word: L'2' },
@@ -468,29 +406,11 @@ const struct locale_data _nl_C_LC_CTYPE =
     { word: L'7' },
     { word: L'8' },
     { word: L'9' },
-#if BYTE_ORDER == BIG_ENDIAN
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-    { word: L'\0' },
-#endif
-    { word: 0 },
-    { word: 0 },
     { word: 0 },
     { word: 0 },
     { string: "" },
     { string: "" },
     { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
-    { string: "" },
     { string: "" }
   }
 };
diff --git a/locale/C-monetary.c b/locale/C-monetary.c
index 3cb1a57b4e..d82166c6fc 100644
--- a/locale/C-monetary.c
+++ b/locale/C-monetary.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -33,7 +33,7 @@ const struct locale_data _nl_C_LC_MONETARY =
   _nl_C_name,
   NULL, 0, 0, /* no file mapped */
   UNDELETABLE,
-  49,
+  43,
   {
     { string: "" },
     { string: "" },
diff --git a/locale/C-paper.c b/locale/C-paper.c
index 9bd1cdcbdb..fa3e8557d7 100644
--- a/locale/C-paper.c
+++ b/locale/C-paper.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -29,11 +29,9 @@ const struct locale_data _nl_C_LC_PAPER =
   _nl_C_name,
   NULL, 0, 0, /* no file mapped */
   UNDELETABLE,
-  4,
+  2,
   {
     { word: 297 },
-    { word: 297 },
-    { word: 210 },
     { word: 210 }
   }
 };
diff --git a/locale/C-time.c b/locale/C-time.c
index 34ed40507f..9be32c06b3 100644
--- a/locale/C-time.c
+++ b/locale/C-time.c
@@ -82,7 +82,6 @@ const struct locale_data _nl_C_LC_TIME =
     { string: "" },
     { word: 0 },
     { string: "" },
-    { string: "" },
     { wstr: (const uint32_t *) L"Sun" },
     { wstr: (const uint32_t *) L"Mon" },
     { wstr: (const uint32_t *) L"Tue" },
diff --git a/locale/Makefile b/locale/Makefile
index 622d7f1873..84c73ba8b2 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -79,7 +79,7 @@ localepath = "$(localedir):$(i18ndir)"
 
 CPPFLAGS := -DLOCALE_PATH='$(localepath)' \
 	    -DLOCALEDIR='"$(localedir)"' \
-	    -DLOCALE_ALIAS_PATH='"$(localedir):$(i18ndir)"' \
+	    -DLOCALE_ALIAS_PATH='"$(msgcatdir):$(i18ndir)"' \
 	    -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
 	    -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
 	    -DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \
diff --git a/locale/categories.def b/locale/categories.def
index 36020cf1a6..4a617875d2 100644
--- a/locale/categories.def
+++ b/