Update.

1999-12-23  Ulrich Drepper  <drepper@cygnus.com>

	* locale/programs/ld-monetary.c (monetary_finish): Add cast to
	prevent warning.

	* locale/programs/ld-collate.c: Implement writing out multibyte
	collation data.

	* locale/setlocale.c (setlocale): Allow setting LC_COLLATE again.
	* locale/localeinfo.h: Declare variables only for currently implemented
	collate functionality.  Remove FORWARD_CHAR and ELLIPSIS_CHAR.
	* locale/lc-collate.c: Define variables only for currently implemented
	functionality.
	* locale/langinfo.h: Define symbols only for currently implemented
	functionality.
	* locale/categories.def: Define elements for currently implemented
	functionality.
	* locale/C-collate.c: Comment out definitions of arrays with symbol
	name definitions etc.
	(_nl_C_LC_COLLATE): Update for currently defined information.

	* intl/libintl.h: Remove dcgettext macro definition.
	* intl/gettextP.h: Declare _nl_msg_cat_cntr.

	* locale/iso-4217.def: Add NAD.  Remove a few obsolete entries.

	* sysdeps/generic/glob.c (glob): Pass alternate file access functions
	also in recursive call.  Patch by Joe Orton <joe@orton.demon.co.uk>.

1999-12-22  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/sparc/fpu/ftestexcept.c (fetestexcept): Use proper type
	for __fenv_stfsr argument.
	* sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list: Add
	truncate64, ftruncate64, fstat64, lstat64, stat64 and mmap2.
	Remove ugetrlimit.
	* sysdeps/unix/sysv/linux/sparc/sparc32/mmap64.c: New file.
	* sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
	(XSTAT_IS_XSTAT64): Define.
	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Add
	__libc_lseek64, __libc_pread, __libc_pread64, __libc_pwrite
	and __libc_pwrite64.
	Remove oldgetrlimit and oldsetrlimit.
	* sysdeps/unix/sysv/linux/sparc/sparc64/fxstat64.c: New file.
	* sysdeps/unix/sysv/linux/sparc/sparc64/lxstat64.c: New file.
	* sysdeps/unix/sysv/linux/sparc/sparc64/xstat64.c: New file.

	* sysdeps/unix/sysv/linux/fxstat64.c (__fxstat64): Pass the buf
	pointer to the syscall, not address of that pointer.
	* sysdeps/unix/sysv/linux/lxstat64.c (__lxstat64): Likewise.
	* sysdeps/unix/sysv/linux/xstat64.c (__xstat64): Likewise.
	(__syscall_stat64): Provide proper prototype.

	* sysdeps/unix/sysv/linux/ftruncate64.c (ftruncate64): Share
	has_no_truncate64 between truncate64 and ftruncate64.
	* sysdeps/unix/sysv/linux/truncate64.c (truncate64): Likewise.

	* sysdeps/unix/sysv/linux/kernel-features.h
	(__ASSUME_TRUNCATE64_SYSCALL, __ASSUME_MMAP2_SYSCALL,
	__ASSUME_STAT64_SYSCALL): Define on Sparc for kernels >= 2.3.35.

1999-12-22  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/alpha/syscalls.list: Add __libc_lseek64,
	__libc_pread, __libc_pread64, __libc_pwrite and __libc_pwrite64.

4 files changed, 115 insertions, 0 deletions

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 0a30d2c256..0d3a2a3b37 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,7 @@
 1999-12-23  Ulrich Drepper  <drepper@cygnus.com>
 
+	* SUPPORTED: Add af_ZA, en_BW, and en_ZW.
+
 	* locale/en_BW: New file.
 	* locale/en_ZW: New file.
 	Contributed by Schalk W. Cronjé <schalkc@ntaba.co.za>.
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index c8f7a6a2f7..103068212d 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -1,6 +1,7 @@
 # This file names the currently supported and somewhat tested locales.
 # If you have any additions please use the glibcbug script to send an
 # appropriate message.
+af_ZA ISO-8859-1
 ca_ES ISO-8859-1
 cs_CZ ISO-8859-2
 da_DK ISO-8859-1
@@ -11,11 +12,13 @@ de_DE ISO-8859-1
 de_LU ISO-8859-1
 el_GR ISO-8859-7
 en_AU ISO-8859-1
+en_BW ISO-8859-1
 en_CA ISO-8859-1
 en_DK ISO-8859-1
 en_GB ISO-8859-1
 en_IE ISO-8859-1
 en_US ISO-8859-1
+en_ZW ISO-8859-1
 es_ES ISO-8859-1
 et_EE ISO-8859-1
 eu_ES ISO-8859-1
diff --git a/localedata/locales/en_BW b/localedata/locales/en_BW
new file mode 100644
index 0000000000..2965b7411e
--- /dev/null
+++ b/localedata/locales/en_BW
@@ -0,0 +1,55 @@
+escape_char  /
+comment_char  %
+
+% English language locale for Botswana
+% Source: RAP
+% Email: Schalk W. Cronje <schalkc@ntaba.co.za>
+% Tel: +27 83  2797047
+% Fax: +27 838 2797047
+% Language: en
+% Territory: BW
+% Revision: 1.0
+% Date: 1999-12-23
+% Users: general
+% Repertoiremap: mnemonic,ds
+% Charset: ISO-8859-1
+% Distribution and use is free, also
+% for commercial purposes.
+
+LC_CTYPE
+copy "en_ZA"
+END LC_CTYPE
+
+LC_COLLATE
+copy "en_ZA"
+END LC_COLLATE
+
+LC_MONETARY
+int_curr_symbol         "<B><W><P><SP>"
+currency_symbol         "<P><u>"
+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
+END LC_MONETARY
+
+LC_NUMERIC
+copy "en_ZA"
+END LC_NUMERIC
+
+LC_TIME
+copy "en_ZA"
+END LC_TIME
+
+LC_MESSAGES
+copy "en_ZA"
+END LC_MESSAGES
diff --git a/localedata/locales/en_ZW b/localedata/locales/en_ZW
new file mode 100644
index 0000000000..aaf6c37c57
--- /dev/null
+++ b/localedata/locales/en_ZW
@@ -0,0 +1,55 @@
+escape_char  /
+comment_char  %
+
+% English language locale for Zimbabwe
+% Source: RAP
+% Email: Schalk W. Cronje <schalkc@ntaba.co.za>
+% Tel: +27 83  2797047
+% Fax: +27 838 2797047
+% Language: en
+% Territory: ZW
+% Revision: 1.0
+% Date: 1999-12-23
+% Users: general
+% Repertoiremap: mnemonic,ds
+% Charset: ISO-8859-1
+% Distribution and use is free, also
+% for commercial purposes.
+
+LC_CTYPE
+copy "en_ZA"
+END LC_CTYPE
+
+LC_COLLATE
+copy "en_ZA"
+END LC_COLLATE
+
+LC_MONETARY
+int_curr_symbol         "<Z><W><D><SP>"
+currency_symbol         "<Z><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
+END LC_MONETARY
+
+LC_NUMERIC
+copy "en_ZA"
+END LC_NUMERIC
+
+LC_TIME
+copy "en_ZA"
+END LC_TIME
+
+LC_MESSAGES
+copy "en_ZA"
+END LC_MESSAGES