Update.

1998-02-13 17:39  Ulrich Drepper  <drepper@cygnus.com>

	* elf/Makefile: Don't use --version-script parameter to link ld.so
	unconditionally.

1998-01-02 04:19  Geoff Keating  <geoffk@ozemail.com.au>

	* math/Makefile: Add t_exp.
	* math/libm-test.c: Tighten accuracy bounds for exp(), correct
	constants.
	* math/test-reduce.c: Remove temporarily, it seems to be broken.
	* sysdeps/libm-ieee754/e_exp.c: Use accurate table method.
	* sysdeps/libm-ieee754/e_expf.c: Use table & double precision for
	better accuracy.
	* sysdeps/libm-ieee754/s_exp2.c: Use better polynomial; correct
	algorithm for very large/very small arguments.
	* sysdeps/libm-ieee754/s_exp2f.c: Use slightly better polynomial;
	correct algorithm for very large/very small arguments; adjust for
	new table.
	* sysdeps/libm-ieee754/t_exp.c: New file.
	* sysdeps/libm-ieee754/t_exp2f.h: Use table with smaller deltas.

	* sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Put 'strange test'
	back, with comment that explains what breaks when you remove it :-(.

	* localedata/xfrm-test.c: Avoid integer overflow.

	* stdlib/strfmon.c: char is unsigned, sometimes.

	*sysdeps/powerpc
	* sysdeps/powerpc/Makefile: Remove quad float support.
	* sysdeps/powerpc/q_*.c: Remove, they will become an add-on.
	* sysdeps/powerpc/quad_float.h: Likewise.
	* sysdeps/powerpc/test-arith.c: Likewise.
	* sysdeps/powerpc/test-arithf.c: Likewise.

	* sysdeps/generic/s_exp2.c: Remove, we have this implemented now.
	* sysdeps/generic/s_exp2f.c: Likewise.

	* sysdeps/powerpc/bits/mathinline.h: Use underscores around __asm__,
	don't try anything if _SOFT_FLOAT.

1997-12-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* locale/C-ctype.c (_nl_C_LC_CTYPE_class32): Undo last change.
	* locale/programs/ld-ctype.c (CHAR_CLASS32_TRANS): Likewise.
	* wctype/wctype.c: Likewise.
	* wctype/wctype.h (_ISwxxx): Renamed from _ISxxx, all uses
	changed.  They are incompatible with the _ISxxx values from
	<ctype.h> on little endian machines.
	(_ISwbit) [__BYTE_ORDER == __LITTLE_ENDIAN]: Correctly transform
	bit number.  This fixes the real bug and restores the integrity of
	the ctype locale file.
	* wctype/wcfuncs.c: Change all _ISxxx to _ISwxxx.
	* wctype/wcfuncs_l.c: Likewise.
	* wctype/wcextra.c: Likewise.
	* wctype/wctype_l.c [__BYTE_ORDER == __LITTLE_ENDIAN]: Use correct
	byte swapping.

1998-02-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.S (errno): Put it
	into .bss segment instead of .common, so that aliases on it work.

	* sysdeps/unix/sysv/linux/i386/sysdep.S (errno): Add .type and
	.size directives, put into .bss segment instead of initializing it
	to 4.

1998-02-12 08:00  H.J. Lu  <hjl@gnu.org>

	* libc.map (gnu_get_libc_release, gnu_get_libc_version): Added.

	* version.c (__gnu_get_libc_release, __gnu_get_libc_version): New
	functions.
	Make names without __ weak aliases.
	(__libc_release, __libc_version): Make them static.

	* include/gnu/libc-version.h: New file.
	* Makefile (headers): Add gnu/libc-version.h.

1998-02-13  Ulrich Drepper  <drepper@cygnus.com>

	* stdlib/stdlib.h (struct drand48_data): Leave X to user macros
	and use x for member name.
	Reported by Daniel Lyddy <daniell@cs.berkeley.edu>.

	* stdlib/drand48.c: Change according to member name change.
	* stdlib/drand48_r.c: Likewise.
	* stdlib/lcong48_r.c: Likewise.
	* stdlib/lrand48.c: Likewise.
	* stdlib/lrand48_r.c: Likewise.
	* stdlib/mrand48.c: Likewise.
	* stdlib/mrand48_r.c: Likewise.
	* stdlib/seed48.c: Likewise.
	* stdlib/seed48_r.c: Likewise.
	* stdlib/srand48_r.c: Likewise.

1998-02-11  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* nss/test-netdb.c: Add some more test cases.

1998-02-13 11:39  Ulrich Drepper  <drepper@cygnus.com>

	* libio/iovsscanf.c: Undo last change modifying errno.

1998-02-12  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* stdio-common/vfscanf.c: Never try to read another character
	after EOF.  Don't decrement read_in after EOF, it wasn't
	incremented in the first place.
	(NEXT_WIDE_CHAR): Set First, not first.

1998-02-06 07:48  H.J. Lu  <hjl@gnu.org>

	* db/Makefile ($(inst_libdir)/libndbm.a,
	$(inst_libdir)/libndbm.so): New targets.
	* db2/Makefile: Likewise.

1998-02-12 08:20  H.J. Lu  <hjl@gnu.org>

	* sysdeps/gnu/errlist.awk (sys_errlist, sys_nerr): Create weak
	aliases if HAVE_ELF or PIC or DO_VERSIONING is not defined.

1998-02-12  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/generic/_G_config.h: Define _G_wchar_t, for C++
	<streambuf.h>.
	* sysdeps/unix/sysv/linux/_G_config.h: Likewise.

1998-02-11  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/make-syscalls.sh: Fix sed pattern when dealing with
	versioned symbols.

1998-02-13 08:14  H.J. Lu  <hjl@gnu.org>

	* libc.map (_dl_global_scope, _dl_lookup_symbol_skip,
	_dl_lookup_versioned_symbol, _dl_lookup_versioned_symbol_skip):
	Added for libdl.so.







	* elf/rtld.map: New file.  Needed to define the GLIBC_2.*

	* manual/socket.texi (Host Address Functions): Clarify description
	* sysdeps/unix/sysv/linux/alpha/bits/time.h (struct timeval):

2 files changed, 87 insertions, 90 deletions

diff --git a/locale/C-ctype.c b/locale/C-ctype.c
index 09511eb1e6..851b95fd98 100644
--- a/locale/C-ctype.c
+++ b/locale/C-ctype.c
@@ -95,92 +95,92 @@ const char _nl_C_LC_CTYPE_class[768] =
   /* 0xfa */ "\002\000" "\002\000" "\002\000" "\002\000" "\002\000" "\002\000"
 ;
 const char _nl_C_LC_CTYPE_class32[1024] =
-  /* 0x00 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x03 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x06 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x09 */ "\003\040\000\000" "\002\040\000\000" "\002\040\000\000"
-  /* 0x0c */ "\002\040\000\000" "\002\040\000\000" "\002\000\000\000"
-  /* 0x0f */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x12 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x15 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x18 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x1b */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x1e */ "\002\000\000\000" "\002\000\000\000" "\001\140\000\000"
-  /* 0x21 */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
-  /* 0x24 */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
-  /* 0x27 */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
-  /* 0x2a */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
-  /* 0x2d */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
-  /* 0x30 */ "\010\330\000\000" "\010\330\000\000" "\010\330\000\000"
-  /* 0x33 */ "\010\330\000\000" "\010\330\000\000" "\010\330\000\000"
-  /* 0x36 */ "\010\330\000\000" "\010\330\000\000" "\010\330\000\000"
-  /* 0x39 */ "\010\330\000\000" "\004\300\000\000" "\004\300\000\000"
-  /* 0x3c */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
-  /* 0x3f */ "\004\300\000\000" "\004\300\000\000" "\010\325\000\000"
-  /* 0x42 */ "\010\325\000\000" "\010\325\000\000" "\010\325\000\000"
-  /* 0x45 */ "\010\325\000\000" "\010\325\000\000" "\010\305\000\000"
-  /* 0x48 */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
-  /* 0x4b */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
-  /* 0x4e */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
-  /* 0x51 */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
-  /* 0x54 */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
-  /* 0x57 */ "\010\305\000\000" "\010\305\000\000" "\010\305\000\000"
-  /* 0x5a */ "\010\305\000\000" "\004\300\000\000" "\004\300\000\000"
-  /* 0x5d */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
-  /* 0x60 */ "\004\300\000\000" "\010\326\000\000" "\010\326\000\000"
-  /* 0x63 */ "\010\326\000\000" "\010\326\000\000" "\010\326\000\000"
-  /* 0x66 */ "\010\326\000\000" "\010\306\000\000" "\010\306\000\000"
-  /* 0x69 */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
-  /* 0x6c */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
-  /* 0x6f */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
-  /* 0x72 */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
-  /* 0x75 */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
-  /* 0x78 */ "\010\306\000\000" "\010\306\000\000" "\010\306\000\000"
-  /* 0x7b */ "\004\300\000\000" "\004\300\000\000" "\004\300\000\000"
-  /* 0x7e */ "\004\300\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x81 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x84 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x87 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x8a */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x8d */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x90 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x93 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x96 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x99 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x9c */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0x9f */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xa2 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xa5 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xa8 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xab */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xae */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xb1 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xb4 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xb7 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xba */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xbd */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xc0 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xc3 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xc6 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xc9 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xcc */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xcf */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xd2 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xd5 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xd8 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xdb */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xde */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xe1 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xe4 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xe7 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xea */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xed */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xf0 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xf3 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xf6 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xf9 */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xfc */ "\002\000\000\000" "\002\000\000\000" "\002\000\000\000"
-  /* 0xff */ "\002\000\000\000"
+  /* 0x00 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x03 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x06 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x09 */ "\000\000\003\040" "\000\000\002\040" "\000\000\002\040"
+  /* 0x0c */ "\000\000\002\040" "\000\000\002\040" "\000\000\002\000"
+  /* 0x0f */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x12 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x15 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x18 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x1b */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x1e */ "\000\000\002\000" "\000\000\002\000" "\000\000\001\140"
+  /* 0x21 */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+  /* 0x24 */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+  /* 0x27 */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+  /* 0x2a */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+  /* 0x2d */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+  /* 0x30 */ "\000\000\010\330" "\000\000\010\330" "\000\000\010\330"
+  /* 0x33 */ "\000\000\010\330" "\000\000\010\330" "\000\000\010\330"
+  /* 0x36 */ "\000\000\010\330" "\000\000\010\330" "\000\000\010\330"
+  /* 0x39 */ "\000\000\010\330" "\000\000\004\300" "\000\000\004\300"
+  /* 0x3c */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+  /* 0x3f */ "\000\000\004\300" "\000\000\004\300" "\000\000\010\325"
+  /* 0x42 */ "\000\000\010\325" "\000\000\010\325" "\000\000\010\325"
+  /* 0x45 */ "\000\000\010\325" "\000\000\010\325" "\000\000\010\305"
+  /* 0x48 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+  /* 0x4b */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+  /* 0x4e */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+  /* 0x51 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+  /* 0x54 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+  /* 0x57 */ "\000\000\010\305" "\000\000\010\305" "\000\000\010\305"
+  /* 0x5a */ "\000\000\010\305" "\000\000\004\300" "\000\000\004\300"
+  /* 0x5d */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+  /* 0x60 */ "\000\000\004\300" "\000\000\010\326" "\000\000\010\326"
+  /* 0x63 */ "\000\000\010\326" "\000\000\010\326" "\000\000\010\326"
+  /* 0x66 */ "\000\000\010\326" "\000\000\010\306" "\000\000\010\306"
+  /* 0x69 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+  /* 0x6c */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+  /* 0x6f */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+  /* 0x72 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+  /* 0x75 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+  /* 0x78 */ "\000\000\010\306" "\000\000\010\306" "\000\000\010\306"
+  /* 0x7b */ "\000\000\004\300" "\000\000\004\300" "\000\000\004\300"
+  /* 0x7e */ "\000\000\004\300" "\000\000\002\000" "\000\000\002\000"
+  /* 0x81 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x84 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x87 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x8a */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x8d */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x90 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x93 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x96 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x99 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x9c */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0x9f */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xa2 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xa5 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xa8 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xab */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xae */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xb1 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xb4 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xb7 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xba */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xbd */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xc0 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xc3 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xc6 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xc9 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xcc */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xcf */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xd2 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xd5 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xd8 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xdb */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xde */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xe1 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xe4 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xe7 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xea */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xed */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xf0 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xf3 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xf6 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xf9 */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xfc */ "\000\000\002\000" "\000\000\002\000" "\000\000\002\000"
+  /* 0xff */ "\000\000\002\000"
 ;
 const u_int32_t _nl_C_LC_CTYPE_toupper[384] =
 {
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index f2ad46f092..8ab70abb5a 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -56,9 +56,6 @@ void *xrealloc (void *__ptr, size_t __n);
 #define SWAPU16(w) \
   ((((w)  >> 8) & 0xff) | (((w) & 0xff) << 8))
 
-#define XSWAPU32(w) \
-  ((((w) & 0xff00ff00) >> 8) | (((w) & 0xff00ff) << 8))
-
 
 /* To be compatible with former implementations we for now restrict
    the number of bits for character classes to 16.  When compatibility
@@ -66,7 +63,7 @@ void *xrealloc (void *__ptr, size_t __n);
 #define char_class_t u_int16_t
 #define CHAR_CLASS_TRANS SWAPU16
 #define char_class32_t u_int32_t
-#define CHAR_CLASS32_TRANS XSWAPU32
+#define CHAR_CLASS32_TRANS SWAPU32
 
 
 /* The real definition of the struct for the LC_CTYPE locale.  */