summary refs log tree commit diff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-08-24 10:55:18 +0000
committerUlrich Drepper <drepper@redhat.com>1997-08-24 10:55:18 +0000
commitf41c80910d631bacdaf39ec6d11272db79c59d38 (patch)
tree26b93c7b36e05eb08892aa730788c8f772efe2e3 /locale
parent40a55d2054ef9d9085c4e6b0157c5d30608736fc (diff)
downloadglibc-f41c80910d631bacdaf39ec6d11272db79c59d38.tar.gz
glibc-f41c80910d631bacdaf39ec6d11272db79c59d38.tar.xz
glibc-f41c80910d631bacdaf39ec6d11272db79c59d38.zip
Update.
1997-08-24 12:24  Ulrich Drepper  <drepper@cygnus.com>

	* configure.in (INSTALL): Quote `$'.

	* libc.map: Add __xpg_basename.

	* csu/Makefile (initfini.s): Disable optimization.

	* elf/dl-deps.c: Implement handling of DL_FILTER.

	* elf/dl-load.c (_dl_init_paths): Add error check.

	* intl/finddomain.c (_nl_find_domain): Correct comment.
	* intl/localealias.c: Include <bits/libc-lock.h> not <libc-lock.h>.

	* libio/stdio.h: Make {,v}snprintf available if __USE_BSD.
	Change extern inline functions to work correctly in C++.

	* locale/iso-4217.def: Update for more recent ISO 4217 version.

	* locale/loadlocale.c (_nl_load_locale): Add cast.

	* manual/message.texi: Finish gettext section.

	* posix/getopt_init.c: Don't use relative #include path.
	(__getopt_clean_environment): Change function to take pointer to
	environment as argument.  Optimize generation of test string a bit.
	* sysdeps/unix/sysv/linux/init-first.c: Call __getopt_clean_environment
	with additional argument.

	* poisx/glob.c: Add prototype for next_brace_sub.

	* sysdeps/generic/dl-sysdep.c: Recognize AT_BASE value on auxiliary
	vector.

	* sysdeps/i386/dl-machine.h (elf_machine_load_address): Rewrite
	to not generate relocation entry.  Suggested by Richard Henderson.
	(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
	(elf_machine_runtime_setup): Add .aligns.

	* sysdeps/i386/fpu/fraiseexcpt.c: Add volatile to asms.

	* sysdeps/i386/fpu/bits/mathinline.h: Partially undo change of
	1997-08-14 03:14.  gcc 2.7.2* is really broken in some aspects.

	* sysdeps/standalone/i386/i386.h: Clean up asm statements a bit.
	* sysdeps/standalone/i960/i960ca.h: Likewise.

1997-08-22 19:04  Richard Henderson  <rth@cygnus.com>

	* elf/rtld.c (_dl_start): Init _dl_rtld_map.l_opencount due to
	undocumented test addition in _dl_map_object.

	Support ET_EXEC versions of ld.so, for debugging at least:

	* elf/dl-load.c (_dl_map_object): Add_name_to_object could get
	called despite the DT_SONAME != NULL test, segfaulting.  Simplify
	the code here as well.
	* elf/dl-lookup.c (do_lookup): Skip objects with no symtab.
	(_dl_setup_hash): Likewise for hash tables.
	* elf/dl-version.c (_dl_check_map_versions): Likewise for strtabs.
	* elf/rtld.c (_dl_start): Likewise for rpath.
	(_dl_rtld_libname2): New variable.
	(dl_main): Use it to add an soname for ourselves when we don't have
	one of our own.  Base it on the target's .interp.
	(dl_main): Again, skip printing of objects that don't have strtabs.

	Sparc 32 merge:

	* elf/dl-runtime.c (ELF_FIXUP_RETURN_VALUE): Provide default value.
	(fixup): Simplify code.  Use ELF_FIXUP_RETURN_VALUE.
	(profile_fixup): Likewise, though this still needs fixing for
	Sparc32 and PPC.
	* sysdeps/powerpc/dl-machine.h: Transmute ELF_FIXUP_RETURNS_ADDRESS
	to ELF_FIXUP_RETURN_VALUE.

	* sysdeps/sparc/sparc32/dl-machine.h: Implement lazy relocation.
	Fix up _dl_start_user to handle _dl_skip_args properly.
	Use _dl_hwcap to determine if "flush" is available/needed.

	* sysdeps/sparc/configure.in: Remove.  It doesn't actually do
	anything anymore, and what it did do is done somewhere else.
	* sysdeps/sparc/configure: Likewise.

	* sysdeps/sparc/fpu/bits/mathdef.h (FP_ILOGB0, FP_ILOGBNAN): New.

	* sysdeps/sparc/fpu/fraiseexcpt.c: Rearrange for smaller code.

	* sysdeps/sparc/sparc32/Makefile: Fix sparc->sparc/sparc32 bits
	in divrem expansions.

	* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (END, LOC): New
	definitions for assembly syntax differences.

	* sysdeps/sparc/sparc32/__longjmp.S: %g6,%g7 are reserved to the
	"system".  Use %g2,%g3 instead.  Use new local label macro.
	* sysdeps/sparc/sparc32/add_n.S: Use <sysdep.h> and ENTRY, END,
	and LOC for proper assembly headers/footers.
	* sysdeps/sparc/sparc32/addmul_1.S: Likewise.
	* sysdeps/sparc/sparc32/alloca.S: Likewise.
	* sysdeps/sparc/sparc32/dotmul.S: Likewise.
	* sysdeps/sparc/sparc32/lshift.S: Likewise.
	* sysdeps/sparc/sparc32/mul_1.S: Likewise.
	* sysdeps/sparc/sparc32/rshift.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv8/addmul_1.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv8/mul_1.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv8/submul_1.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv8/udiv_qrnnd.S: Likewise.
	* sysdeps/sparc/sparc32/sub_n.S: Likewise.
	* sysdeps/sparc/sparc32/submul_1.S: Likewise.
	* sysdeps/sparc/sparc32/udiv_qrnnd.S: Likewise.
	* sysdeps/sparc/sparc32/umul.S: Likewise.
	* sysdeps/sparc/sparc32/divrem.m4: Likewise.
	* sysdeps/sparc/sparc32/rem.S: Regenerate.
	* sysdeps/sparc/sparc32/sdiv.S: Regenerate.
	* sysdeps/sparc/sparc32/udiv.S: Regenerate.
	* sysdeps/sparc/sparc32/urem.S: Regenerate.

	* sysdeps/sparc/sparc32/sparcv8/dotmul.S: New file.
	* sysdeps/sparc/sparc32/sparcv8/rem.S: New file.
	* sysdeps/sparc/sparc32/sparcv8/sdiv.S: New file.
	* sysdeps/sparc/sparc32/sparcv8/udiv.S: New file.
	* sysdeps/sparc/sparc32/sparcv8/umul.S: New file.
	* sysdeps/sparc/sparc32/sparcv8/urem.S: New file.

	* sysdeps/sparc/sparc32/bsd-_setjmp.S: Dike out.
	* sysdeps/sparc/sparc32/bsd-setjmp.S: Likewise.
	* sysdeps/sparc/sparc32/setjmp.S: Add _setjmp and setjmp entry points.

	* sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S:
	Clean up PIC code.

	* sysdeps/sparc/sparc32/elf/start.S: New file, slightly modified
	from the sparc64 version.
	* sysdeps/sparc/sparc32/elf/start.c: Removed.

	* sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Rewrite in
	assembly based on the sparc64 version.

	* sysdeps/sparc/sparc32/fpu/bits/fenv.h: Duh.  Use proper syntax
	for manipulating %fsr.
	* sysdeps/sparc/sparc32/fpu/fpu_control.h: Make IEEE conformance
	be the default.

	* elf/elf.h (HWCAP_SPARC_*): New definitions.
	* elf/rtld.c (_dl_hwcap): New variable.
	* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Record AT_HWCAP.

	* sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: New file.
	Attempt to get hold of the page size based on what we might have
	been told at startup time in _dl_pagesize.  This will be obsolete
	when I finish the kernel hooks for a proper sysconf(), stay tuned.

	Sparc 64 merge:

	* sysdeps/sparc/sparc64/dl-machine.h (ELF_FIXUP_RETURN_VALUE): New.
	Figure out the right thing to return based on the .plt format.

	* sysdeps/sparc/sparc64/fpu/fpu_control.h: Update comment.

	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h (__dev_t):
	Should have been 64-bits wide.

	* sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h: sll->sllx,
	optimize for branch delay slot usage.

1997-08-22  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* csu/Makefile ($(objpfx)crt%.o): Fix a missing *.so -> *.os
	change.

1997-08-20  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* math/libm-test.c (identities): Change epsilon.

	* sysdeps/i386/fpu/bits/mathinline.h: Correct arguments to fabs,
	fabsf, fabsl, __fabsl.

	* sysdeps/libm-i387/e_remainderl.S: Pop extra value from FPU stack.
	* sysdeps/libm-ieee754/s_csinhl.c: Include <fenv.h>.
Diffstat (limited to 'locale')
-rw-r--r--locale/iso-4217.def333
-rw-r--r--locale/loadlocale.c2
2 files changed, 177 insertions, 158 deletions
diff --git a/locale/iso-4217.def b/locale/iso-4217.def
index 46880a2348..d7a0f37482 100644
--- a/locale/iso-4217.def
+++ b/locale/iso-4217.def
@@ -1,171 +1,190 @@
 /*
- * Defines the valid international currency symbols according to ISO-4217.
+ * Defines the valid international currency symbols according to ISO 4217.
  * This is used in monetary.c(monetary_check).
  *
  * If you find something missing or wrong contact <bug-glibc@prep.ai.mit.edu>
  *
  * !!! The list has to be sorted !!!
  */
-DEFINE_INT_CURR("AED ")		/* United Arab Emirates  */
-DEFINE_INT_CURR("AFA ")		/* Afghanistan  */
-DEFINE_INT_CURR("ALL ")		/* Albania  */
+DEFINE_INT_CURR("ADP ")		/* Andorran Peseta  */
+DEFINE_INT_CURR("AED ")		/* United Arab Emirates Dirham  */
+DEFINE_INT_CURR("AFA ")		/* Afghanistan Afgani  */
+DEFINE_INT_CURR("ALL ")		/* Albanian Lek  */
+DEFINE_INT_CURR("AMD ")		/* Armenia Dram  */
 DEFINE_INT_CURR("ANG ")		/* Netherlands Antilles  */
-DEFINE_INT_CURR("AOK ")		/* Angola  */
-DEFINE_INT_CURR("ARP ")		/* Argentina  */
-DEFINE_INT_CURR("ATS ")		/* Austria   */
-DEFINE_INT_CURR("AUD ")		/* Australia  */
-DEFINE_INT_CURR("BBD ")		/* Barbados  */
-DEFINE_INT_CURR("BDT ")		/* Bangladesh  */
-DEFINE_INT_CURR("BEF ")		/* Belgium   */
-DEFINE_INT_CURR("BGL ")		/* Bulgaria  */
-DEFINE_INT_CURR("BHD ")		/* Bahrain  */
+DEFINE_INT_CURR("AOK ")		/* Angolan Kwanza  */
+DEFINE_INT_CURR("AON ")		/* Angolan New Kwanza  */
+DEFINE_INT_CURR("ARP ")		/* Argentine Peso  */
+DEFINE_INT_CURR("ATS ")		/* Austrian Schilling  */
+DEFINE_INT_CURR("AUD ")		/* Australian Dollar  */
+DEFINE_INT_CURR("AZM ")		/* Azerbaijan Manat  */
+DEFINE_INT_CURR("BBD ")		/* Barbados Dollar  */
+DEFINE_INT_CURR("BDT ")		/* Bangladesh Taka  */
+DEFINE_INT_CURR("BEF ")		/* Belgian Franc  */
+DEFINE_INT_CURR("BGL ")		/* Bulgarian Lev  */
+DEFINE_INT_CURR("BHD ")		/* Bahraini Dinar  */
 DEFINE_INT_CURR("BIF ")		/* Burundi  */
-DEFINE_INT_CURR("BMD ")		/* Burmuda  */
-DEFINE_INT_CURR("BND ")		/* Brunei  */
-DEFINE_INT_CURR("BOP ")		/* Bolivia  */
-DEFINE_INT_CURR("BRC ")		/* Brazil  */
-DEFINE_INT_CURR("BSD ")		/* Bahamas  */
+DEFINE_INT_CURR("BMD ")		/* Burmudian Dollar  */
+DEFINE_INT_CURR("BND ")		/* Brunei Dollar  */
+DEFINE_INT_CURR("BOP ")		/* Bolivian Boliviano  */
+DEFINE_INT_CURR("BPS ")		/* Canton and Enderbury Islands  */
+DEFINE_INT_CURR("BRC ")		/* Brazil Real  */
+DEFINE_INT_CURR("BRL ")		/* Brazil Cruzeiro  */
+DEFINE_INT_CURR("BRR ")		/* Brazil Real  */
+DEFINE_INT_CURR("BSD ")		/* Bahamas Dollar  */
+DEFINE_INT_CURR("BTN ")		/* Bhutan Ngultrum  */
 DEFINE_INT_CURR("BUK ")		/* Burma  */
-DEFINE_INT_CURR("BWP ")		/* Botswana  */
-DEFINE_INT_CURR("BZD ")		/* Belize  */
-DEFINE_INT_CURR("CAD ")		/* Canada  */
-DEFINE_INT_CURR("CHF ")		/* Switzerland, Liechtenstein  */
-DEFINE_INT_CURR("CLP ")		/* Chile  */
-DEFINE_INT_CURR("CNY ")		/* China  */
-DEFINE_INT_CURR("COP ")		/* Colombia  */
-DEFINE_INT_CURR("CRC ")		/* Costa Rica  */
-DEFINE_INT_CURR("CSK ")		/* Czechoslovakia  */
-DEFINE_INT_CURR("CUP ")		/* Cuba  */
-DEFINE_INT_CURR("CVE ")		/* Cape Verde  */
-DEFINE_INT_CURR("CYP ")		/* Cyprus  */
-DEFINE_INT_CURR("DEM ")		/* Germany  */
-DEFINE_INT_CURR("DJF ")		/* Djibouti  */
-DEFINE_INT_CURR("DKK ")		/* Denmark  */
+DEFINE_INT_CURR("BWP ")		/* Botswana Pula  */
+DEFINE_INT_CURR("BZD ")		/* Belize Dollar  */
+DEFINE_INT_CURR("CAD ")		/* Canadian Dollar  */
+DEFINE_INT_CURR("CFP ")		/* French Pacific Island Franc  */
+DEFINE_INT_CURR("CHF ")		/* Swiss Franc (Liechtenstein)  */
+DEFINE_INT_CURR("CLP ")		/* Chilean Peso  */
+DEFINE_INT_CURR("CNY ")		/* China Yuan Renminbi  */
+DEFINE_INT_CURR("COP ")		/* Colombian Peso  */
+DEFINE_INT_CURR("CRC ")		/* Costa Rican Colon  */
+DEFINE_INT_CURR("CUP ")		/* Cuban Peso  */
+DEFINE_INT_CURR("CVE ")		/* Cape Verde Escudo  */
+DEFINE_INT_CURR("CYP ")		/* Cypriot Pound  */
+DEFINE_INT_CURR("CZK ")		/* Czech Koruna  */
+DEFINE_INT_CURR("DEM ")		/* German Mark  */
+DEFINE_INT_CURR("DJF ")		/* Djibouti Franc  */
+DEFINE_INT_CURR("DKK ")		/* Danish Krone (Faroe Islands, Greenland)  */
 DEFINE_INT_CURR("DOP ")		/* Dominican Republic  */
-DEFINE_INT_CURR("DZD ")		/* Algeria  */
-DEFINE_INT_CURR("ECS ")		/* Ecuador  */
-DEFINE_INT_CURR("EEK ")		/* Estonia  */
-DEFINE_INT_CURR("EGP ")		/* Egypt  */
-DEFINE_INT_CURR("ESP ")		/* Spain  */
-DEFINE_INT_CURR("ETB ")		/* Ethiopia  */
-DEFINE_INT_CURR("FIM ")		/* Finland  */
-DEFINE_INT_CURR("FJD ")		/* Fiji  */
-DEFINE_INT_CURR("FKP ")		/* Falkland Islands (Malvinas)  */
-DEFINE_INT_CURR("FRF ")		/* France  */
-DEFINE_INT_CURR("GBP ")		/* Great Britain  */
-DEFINE_INT_CURR("GHC ")		/* Ghana  */
-DEFINE_INT_CURR("GIP ")		/* Gibraltar  */
-DEFINE_INT_CURR("GMD ")		/* Gambia  */
-DEFINE_INT_CURR("GNS ")		/* Guinea  */
-DEFINE_INT_CURR("GQE ")		/* Equatorial Guinea  */
-DEFINE_INT_CURR("GRD ")		/* Greece  */
-DEFINE_INT_CURR("GTQ ")		/* Guatemala  */
-DEFINE_INT_CURR("GWP ")		/* Guinea-Bissau  */
-DEFINE_INT_CURR("GYD ")		/* Guyana  */
-DEFINE_INT_CURR("HKD ")		/* Hong Kong  */
-DEFINE_INT_CURR("HNL ")		/* Honduras  */
-DEFINE_INT_CURR("HRD ")		/* Croatia  */
-DEFINE_INT_CURR("HTG ")		/* Haiti  */
-DEFINE_INT_CURR("HUF ")		/* Hungary  */
-DEFINE_INT_CURR("IDR ")		/* Indonesia  */
-DEFINE_INT_CURR("IEP ")		/* Ireland  */
-DEFINE_INT_CURR("ILS ")		/* Israel  */
-DEFINE_INT_CURR("INR ")		/* India, Bhutan  */
-DEFINE_INT_CURR("IQD ")		/* Iraq  */
-DEFINE_INT_CURR("IRR ")		/* Iran  */
-DEFINE_INT_CURR("ISK ")		/* Iceland  */
-DEFINE_INT_CURR("ITL ")		/* Italy  */
-DEFINE_INT_CURR("JMD ")		/* Jamaica  */
-DEFINE_INT_CURR("JOD ")		/* Jordan  */
-DEFINE_INT_CURR("JPY ")		/* Japan  */
-DEFINE_INT_CURR("KES ")		/* Kenya  */
-DEFINE_INT_CURR("KHR ")		/* Democratic Kampuchea  */
-DEFINE_INT_CURR("KMF ")		/* Comoros  */
-DEFINE_INT_CURR("KPW ")		/* Democratic People's of Korea  */
-DEFINE_INT_CURR("KRW ")		/* Republic of Korea  */
-DEFINE_INT_CURR("KWD ")		/* Kuwait  */
+DEFINE_INT_CURR("DZD ")		/* Algerian Dinar  */
+DEFINE_INT_CURR("ECS ")		/* Ecuadoran Sucre  */
+DEFINE_INT_CURR("EEK ")		/* Estonian Kroon  */
+DEFINE_INT_CURR("EGP ")		/* Egyptian Pound  */
+DEFINE_INT_CURR("ESP ")		/* Spanish Peseta  */
+DEFINE_INT_CURR("ETB ")		/* Ethiopian Birr  */
+DEFINE_INT_CURR("EUR ")		/* European Union Euro  */
+DEFINE_INT_CURR("FIM ")		/* Finnish Markka  */
+DEFINE_INT_CURR("FJD ")		/* Fiji Dollar  */
+DEFINE_INT_CURR("FKP ")		/* Falkland Islands Pound (Malvinas)  */
+DEFINE_INT_CURR("FRF ")		/* French Franc  */
+DEFINE_INT_CURR("GBP ")		/* British Pound  */
+DEFINE_INT_CURR("GEK ")		/* Georgia Lari  */
+DEFINE_INT_CURR("GHC ")		/* Ghana Cedi  */
+DEFINE_INT_CURR("GIP ")		/* Gibraltar Pound  */
+DEFINE_INT_CURR("GMD ")		/* Gambian Dalasi  */
+DEFINE_INT_CURR("GNS ")		/* Guinea Syli  */
+DEFINE_INT_CURR("GQE ")		/* Equatorial Guinea Ekwele  */
+DEFINE_INT_CURR("GRD ")		/* Greek Drachma  */
+DEFINE_INT_CURR("GTQ ")		/* Guatemala Quetzal  */
+DEFINE_INT_CURR("GWP ")		/* Guinea-Bissau Peso  */
+DEFINE_INT_CURR("GYD ")		/* Guyana Dollar  */
+DEFINE_INT_CURR("HKD ")		/* Hong Kong Dollar  */
+DEFINE_INT_CURR("HNL ")		/* Honduras Lempira  */
+DEFINE_INT_CURR("HRK ")		/* Croatia Kuna  */
+DEFINE_INT_CURR("HTG ")		/* Haiti Gourde  */
+DEFINE_INT_CURR("HUF ")		/* Hungarian Forint  */
+DEFINE_INT_CURR("IDR ")		/* Indonesia Rupiah  */
+DEFINE_INT_CURR("IEP ")		/* Irish Pound  */
+DEFINE_INT_CURR("ILS ")		/* Israeli Shekel  */
+DEFINE_INT_CURR("INR ")		/* Indian Rupee (Bhutan)  */
+DEFINE_INT_CURR("IQD ")		/* Iraqi Dinar  */
+DEFINE_INT_CURR("IRR ")		/* Iranian Rial  */
+DEFINE_INT_CURR("ISK ")		/* Iceland Krona  */
+DEFINE_INT_CURR("ITL ")		/* Italian Lira (San Marino, Vatican City)  */
+DEFINE_INT_CURR("JMD ")		/* Jamaican Dollar  */
+DEFINE_INT_CURR("JOD ")		/* Jordanian Dinar  */
+DEFINE_INT_CURR("JPY ")		/* Japanese Yen  */
+DEFINE_INT_CURR("KES ")		/* Kenyan Shilling  */
+DEFINE_INT_CURR("KGS ")		/* Kyrgyzstan Som  */
+DEFINE_INT_CURR("KHR ")		/* Democratic Kampuchea Riel  */
+DEFINE_INT_CURR("KMF ")		/* Comoros Franc  */
+DEFINE_INT_CURR("KPW ")		/* Democratic People's of Korea Won  */
+DEFINE_INT_CURR("KRW ")		/* Republic of Korea Won  */
+DEFINE_INT_CURR("KWD ")		/* Kuwaiti Dinar  */
 DEFINE_INT_CURR("KYD ")		/* Cayman Islands  */
-DEFINE_INT_CURR("LAK ")		/* Lao People's Democratic Republic */
-DEFINE_INT_CURR("LBP ")		/* Lebanon  */
-DEFINE_INT_CURR("LKR ")		/* Sri Lanka  */
-DEFINE_INT_CURR("LRD ")		/* Liberia  */
-DEFINE_INT_CURR("LSM ")		/* Lesotho  */
-DEFINE_INT_CURR("LTL ")		/* Lithuania  */
-DEFINE_INT_CURR("LUF ")		/* Luxembourg  */
-DEFINE_INT_CURR("LVL ")		/* Latvia  */
-DEFINE_INT_CURR("LYD ")		/* Libyan Arab Jamahiriya  */
-DEFINE_INT_CURR("MAD ")		/* Morocco  */
-DEFINE_INT_CURR("MGF ")		/* Madagascar  */
-DEFINE_INT_CURR("MLF ")		/* Mali  */
-DEFINE_INT_CURR("MNT ")		/* Mongolia  */
-DEFINE_INT_CURR("MOP ")		/* Macau  */
-DEFINE_INT_CURR("MRO ")		/* Mauritania  */
-DEFINE_INT_CURR("MTP ")		/* Malta  */
-DEFINE_INT_CURR("MUR ")		/* Mauritius  */
-DEFINE_INT_CURR("MVR ")		/* Maldives  */
-DEFINE_INT_CURR("MWK ")		/* Malawi  */
-DEFINE_INT_CURR("MXP ")		/* Mexico  */
-DEFINE_INT_CURR("MYR ")		/* Malaysia  */
-DEFINE_INT_CURR("MZM ")		/* Mozambique  */
-DEFINE_INT_CURR("NGN ")		/* Nigeria  */
-DEFINE_INT_CURR("NIC ")		/* Nicaragua  */
-DEFINE_INT_CURR("NLG ")		/* Netherlands  */
-DEFINE_INT_CURR("NOK ")		/* Norway  */
-DEFINE_INT_CURR("NPR ")		/* Nepal  */
-DEFINE_INT_CURR("NZD ")		/* New Zealand  */
-DEFINE_INT_CURR("OMR ")		/* Oman  */
-DEFINE_INT_CURR("PAB ")		/* Panama  */
-DEFINE_INT_CURR("PES ")		/* Peru  */
-DEFINE_INT_CURR("PGK ")		/* Papau New Guinea  */
-DEFINE_INT_CURR("PHP ")		/* Philippines  */
-DEFINE_INT_CURR("PKR ")		/* Pakistan  */
-DEFINE_INT_CURR("PLZ ")		/* Poland  */
-DEFINE_INT_CURR("PTE ")		/* Portugal  */
-DEFINE_INT_CURR("PYG ")		/* Paraguay  */
-DEFINE_INT_CURR("QAR ")		/* Qatar  */
-DEFINE_INT_CURR("ROL ")		/* Romania  */
-DEFINE_INT_CURR("RUR ")		/* Russia  */
-DEFINE_INT_CURR("RWF ")		/* Rwanda  */
-DEFINE_INT_CURR("SAR ")		/* Saudi Arabia  */
-DEFINE_INT_CURR("SBD ")		/* Solomon Islands  */
-DEFINE_INT_CURR("SCR ")		/* Seychelles  */
-DEFINE_INT_CURR("SDP ")		/* Sudan  */
-DEFINE_INT_CURR("SEK ")		/* Sweden  */
-DEFINE_INT_CURR("SGD ")		/* Singapore  */
-DEFINE_INT_CURR("SHP ")		/* St. Helena  */
-DEFINE_INT_CURR("SIT ")		/* Slovenia  */
-DEFINE_INT_CURR("SLL ")		/* Sierra Leone  */
-DEFINE_INT_CURR("SOS ")		/* Somalia  */
-DEFINE_INT_CURR("SRG ")		/* Suriname  */
-DEFINE_INT_CURR("STD ")		/* Sao Tome and Principe  */
-DEFINE_INT_CURR("SUR ")		/* Ukrainian, Byelorussion  */
-DEFINE_INT_CURR("SVC ")		/* El Salvador  */
-DEFINE_INT_CURR("SYP ")		/* Syrian Arab Republic  */
-DEFINE_INT_CURR("SZL ")		/* Swaziland  */
-DEFINE_INT_CURR("THB ")		/* Thailand  */
-DEFINE_INT_CURR("TND ")		/* Tunisia  */
-DEFINE_INT_CURR("TOP ")		/* Tonga  */
-DEFINE_INT_CURR("TPE ")		/* East Timor  */
-DEFINE_INT_CURR("TRL ")		/* Turkey  */
+DEFINE_INT_CURR("KZT ")		/* Kazakhstan Tenge  */
+DEFINE_INT_CURR("LAK ")		/* Lao People's Democratic Republic New Kip  */
+DEFINE_INT_CURR("LBP ")		/* Lebanese Pound  */
+DEFINE_INT_CURR("LKR ")		/* Sri Lankan Rupee  */
+DEFINE_INT_CURR("LRD ")		/* Liberian Dollar  */
+DEFINE_INT_CURR("LSM ")		/* Lesotho Maloti  */
+DEFINE_INT_CURR("LTL ")		/* Lithuanian Litas  */
+DEFINE_INT_CURR("LUF ")		/* Luxembourg Franc  */
+DEFINE_INT_CURR("LVL ")		/* Latvia Lat  */
+DEFINE_INT_CURR("LYD ")		/* Libyan Arab Jamahiriya Dinar  */
+DEFINE_INT_CURR("MAD ")		/* Moroccan Dirham  */
+DEFINE_INT_CURR("MDL ")		/* Moldova Lei  */
+DEFINE_INT_CURR("MGF ")		/* Madagasy Franc  */
+DEFINE_INT_CURR("MLF ")		/* Mali Franc  */
+DEFINE_INT_CURR("MMK ")		/* Myanmar Kyat  */
+DEFINE_INT_CURR("MNT ")		/* Mongolia Tugrik  */
+DEFINE_INT_CURR("MOP ")		/* Macau Pataca  */
+DEFINE_INT_CURR("MRO ")		/* Mauritania Ouguiya  */
+DEFINE_INT_CURR("MTP ")		/* Maltese Lira  */
+DEFINE_INT_CURR("MUR ")		/* Mauritius Rupee  */
+DEFINE_INT_CURR("MVR ")		/* Maldives Rupee  */
+DEFINE_INT_CURR("MWK ")		/* Malawi Kwacha  */
+DEFINE_INT_CURR("MXP ")		/* Mexican Peso  */
+DEFINE_INT_CURR("MYR ")		/* Malaysian Ringgit  */
+DEFINE_INT_CURR("MZM ")		/* Mozambique Metical  */
+DEFINE_INT_CURR("NGN ")		/* Nigeria Naira  */
+DEFINE_INT_CURR("NIC ")		/* Nicaragua Cordoba  */
+DEFINE_INT_CURR("NLG ")		/* Netherlands Guilder  */
+DEFINE_INT_CURR("NOK ")		/* Norwegian Krone  */
+DEFINE_INT_CURR("NPR ")		/* Nepalese Rupee  */
+DEFINE_INT_CURR("NZD ")		/* New Zealand Dollar  */
+DEFINE_INT_CURR("OMR ")		/* Omani Rial  */
+DEFINE_INT_CURR("PAB ")		/* Panamaniam Balboa  */
+DEFINE_INT_CURR("PEN ")		/* Peruvian New Sol  */
+DEFINE_INT_CURR("PGK ")		/* Papau New Guinea Kina  */
+DEFINE_INT_CURR("PHP ")		/* Philippines Peso  */
+DEFINE_INT_CURR("PKR ")		/* Pakistan Rupee  */
+DEFINE_INT_CURR("PLZ ")		/* Polish Zloty  */
+DEFINE_INT_CURR("PTE ")		/* Portugese Escudo  */
+DEFINE_INT_CURR("PYG ")		/* Paraguay Guarani  */
+DEFINE_INT_CURR("QAR ")		/* Qatar Rial  */
+DEFINE_INT_CURR("ROL ")		/* Romanian Leu  */
+DEFINE_INT_CURR("RUR ")		/* Russian Ruble  */
+DEFINE_INT_CURR("RWF ")		/* Rwanda Franc  */
+DEFINE_INT_CURR("SAR ")		/* Saudi Arabia Riyal  */
+DEFINE_INT_CURR("SBD ")		/* Solomon Islands Dollar  */
+DEFINE_INT_CURR("SCR ")		/* Seychelles Rupee  */
+DEFINE_INT_CURR("SDP ")		/* Sudanese Pound  */
+DEFINE_INT_CURR("SEK ")		/* Swedish Krona  */
+DEFINE_INT_CURR("SGD ")		/* Singapore Dollar  */
+DEFINE_INT_CURR("SHP ")		/* St. Helena Pound  */
+DEFINE_INT_CURR("SIT ")		/* Slovenian Tolar  */
+DEFINE_INT_CURR("SKK ")		/* Slovakian Koruna  */
+DEFINE_INT_CURR("SLL ")		/* Sierra Leone Leone  */
+DEFINE_INT_CURR("SOS ")		/* Somalia Schilling  */
+DEFINE_INT_CURR("SRG ")		/* Suriname Guilder  */
+DEFINE_INT_CURR("STD ")		/* Sao Tome and Principe Dobra  */
+DEFINE_INT_CURR("SUR ")		/* Soviet Union Rubel (Ukrainian, Byelorussion)  */
+DEFINE_INT_CURR("SVC ")		/* El Salvador Colon  */
+DEFINE_INT_CURR("SYP ")		/* Syrian Arab Republic Pound  */
+DEFINE_INT_CURR("SZL ")		/* Swaziland Lilangeni  */
+DEFINE_INT_CURR("THB ")		/* Thai Baht  */
+DEFINE_INT_CURR("TMM ")		/* Turkmenistan Manet  */
+DEFINE_INT_CURR("TND ")		/* Tunisian Dinar  */
+DEFINE_INT_CURR("TOP ")		/* Tonga Pa'Anga  */
+DEFINE_INT_CURR("TPE ")		/* East Timor Escudo  */
+DEFINE_INT_CURR("TRL ")		/* Turkish Lira  */
 DEFINE_INT_CURR("TTD ")		/* Trinidad and Tobago  */
-DEFINE_INT_CURR("TWD ")		/* Taiwan, Province of China  */
-DEFINE_INT_CURR("TZS ")		/* United Republic of Tanzania  */
-DEFINE_INT_CURR("UGS ")		/* Uganda  */
-DEFINE_INT_CURR("USD ")		/* United States  */
-DEFINE_INT_CURR("UYP ")		/* Uruguay  */
-DEFINE_INT_CURR("VEB ")		/* Venezuela  */
-DEFINE_INT_CURR("VND ")		/* Viet Nam  */
-DEFINE_INT_CURR("VUV ")		/* Vanuatu  */
-DEFINE_INT_CURR("WST ")		/* Samoa  */
-DEFINE_INT_CURR("XAF ")		/* United Republic of Cameroon, Central African Republic, Chad, Congo, Gabon  */
-DEFINE_INT_CURR("XCD ")		/* Antiqua, Dominica, Grenada, Montserrat, St. Kitts-Nevis-Anguilla, Saint Lucia, Saint Vincent and the Grenadines  */
-DEFINE_INT_CURR("XOF ")		/* Benin, Ivory Coast, Niger, Senegal, Togo, Upper Volta  */
+DEFINE_INT_CURR("TWD ")		/* Taiwan, Province of China Dollar  */
+DEFINE_INT_CURR("TZS ")		/* United Republic of Tanzania Shilling  */
+DEFINE_INT_CURR("UAK ")		/* Ukraine Hryvna  */
+DEFINE_INT_CURR("UGS ")		/* Ugandan Shilling  */
+DEFINE_INT_CURR("USD ")		/* United States Dollar  */
+DEFINE_INT_CURR("UYP ")		/* Uruguay Peso  */
+DEFINE_INT_CURR("UYU ")		/* Uruguay New Peso  */
+DEFINE_INT_CURR("UZS ")		/* Uzbekistan Sum  */
+DEFINE_INT_CURR("VEB ")		/* Venezuelan Bolivar  */
+DEFINE_INT_CURR("VND ")		/* Viet Nam Dong  */
+DEFINE_INT_CURR("VUV ")		/* Vanuatu Vatu  */
+DEFINE_INT_CURR("WST ")		/* Samoa Tala  */
+DEFINE_INT_CURR("XAF ")		/* Central African Franc (United Republic of Cameroon, Central African Republic, Chad, Congo, Gabon)  */
+DEFINE_INT_CURR("XCD ")		/* East Caribbean Dollar (Antiqua, Dominica, Grenada, Montserrat, St. Kitts-Nevis-Anguilla, Saint Lucia, Saint Vincent and the Grenadines)  */
+DEFINE_INT_CURR("XDS ")		/* St. Christopher Dollar  */
+DEFINE_INT_CURR("XOF ")		/* West African Franc (Benin, Ivory Coast, Niger, Senegal, Togo, Upper Volta)  */
 DEFINE_INT_CURR("XPF ")		/* French polynesia, New Caledonia, Wallis and Futuna Islands  */
-DEFINE_INT_CURR("YDD ")		/* Democratic Yemen  */
-DEFINE_INT_CURR("YER ")		/* Yemen  */
-DEFINE_INT_CURR("YUD ")		/* Yugoslavia  */
-DEFINE_INT_CURR("ZAL ")		/* South Africa  */
-DEFINE_INT_CURR("ZAR ")		/* Lesotho, Namibia  */
-DEFINE_INT_CURR("ZMK ")		/* Zambia  */
-DEFINE_INT_CURR("ZRZ ")		/* Zaire  */
-DEFINE_INT_CURR("ZWD ")		/* Zimbabwe  */
+DEFINE_INT_CURR("YDD ")		/* Yemini Dinar (Democratic Yemen)  */
+DEFINE_INT_CURR("YER ")		/* Yemeni Rial  */
+DEFINE_INT_CURR("ZAR ")		/* South Africa Rand (Lesotho, Namibia)  */
+DEFINE_INT_CURR("ZMK ")		/* Zambian Kwacha  */
+DEFINE_INT_CURR("ZRZ ")		/* Zaire Zaire  */
+DEFINE_INT_CURR("ZWD ")		/* Zimbabwe Dollar  */
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index edbe891f84..15570c36d1 100644
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -127,7 +127,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
 #endif
   filedata = (void *) __mmap ((caddr_t) 0, st.st_size, PROT_READ,
 			      MAP_FILE|MAP_COPY|MAP_INHERIT, fd, 0);
-  if (filedata == MAP_FAILED)
+  if ((void *) filedata == MAP_FAILED)
     {
       if (errno == ENOSYS)
 	{