Update.cvs/libc-ud-970827

1997-08-10 19:17  Philip Blundell  <Philip.Blundell@pobox.com>

	* nss/nss_db/db-XXX.c: Include <db_185.h> not <db.h>.  Somebody
	should update this to use the new db API.
	* nss/nss_db/db-netgrp.c: Likewise.
	* nss/nss_db/db-alias.c: Likewise.
	* db2/Makefile: Makefile for db-2.x in glibc.

1997-08-27 21:20  Ulrich Drepper  <drepper@cygnus.com>

	* csu/Makefile (before-compile): New goal.  Make sure abi-tag.h
	is generated.
	[$(elf)=yes] (asm-CPPFLAGS): Make sure abi-tag.h file can be found.

	* Makeconfig [$(build-omitfp)=yes] (CFLAGS-.o): Add
	-D__USE_STRING_INLINES.
	* string/string.f: Move strnlen optimization after inclusion of
	<bits/string.h>.  Include <bits/string.h> only if __USE_STRING_INLINES
	is defined.
	* sysdeps/generic/memcpy.c: Undef memcpy to allow macro of this name
	in <bits/string.h>.
	* sysdeps/generic/memset.c: Likewise.
	* sysdeps/i386/string.h: i386 optimized string functions.
	* sysdeps/i386/i486string.h: i486+ optimized string functions.

	* Makefile (subdirs): Change db to db2.
	* shlib-versions: Bump libdb verion number to 3.
	* include/db.h: Include from db2 directory.
	* include/db_185.h: New file.
	* sysdeps/i386/Makefile [$(subdirs)=db2] (CPPFLAGS): Add macros
	to provide spinlock information for db2.
	* sysdeps/m68k/m68020/Makefile: New file.  Likewise.
	* sysdeps/sparc/Makefile: New file.  Likewise.
	* sysdeps/unix/sysv/linux/Makefile [$(subdirs)=db2] (CPPFLAGS):
	Add -DHAVE_LLSEEK.
	* db2/config.h: Hand-edited config file for db2 in glibc.
	* db2/compat.h: New file from db-2.3.4.
	* db2/db.h: Likewise.
	* db2/db_185.h: Likewise.
	* db2/db_int.h: Likewise.
	* db2/makedb.c: Likewise.
	* db2/btree/bt_close.c: Likewise.
	* db2/btree/bt_compare.c: Likewise.
	* db2/btree/bt_conv.c: Likewise.
	* db2/btree/bt_cursor.c: Likewise.
	* db2/btree/bt_delete.c: Likewise.
	* db2/btree/bt_open.c: Likewise.
	* db2/btree/bt_page.c: Likewise.
	* db2/btree/bt_put.c: Likewise.
	* db2/btree/bt_rec.c: Likewise.
	* db2/btree/bt_recno.c: Likewise.
	* db2/btree/btree_auto.c: Likewise.
	* db2/btree/bt_rsearch.c: Likewise.
	* db2/btree/bt_search.c: Likewise.
	* db2/btree/bt_split.c: Likewise.
	* db2/btree/bt_stat.c: Likewise.
	* db2/btree/btree.src: Likewise.
	* db2/common/db_appinit.c: Likewise.
	* db2/common/db_err.c: Likewise.
	* db2/common/db_byteorder.c: Likewise.
	* db2/common/db_apprec.c: Likewise.
	* db2/common/db_salloc.c: Likewise.
	* db2/common/db_log2.c: Likewise.
	* db2/common/db_region.c: Likewise.
	* db2/common/db_shash.c: Likewise.
	* db2/db/db.c: Likewise.
	* db2/db/db.src: Likewise.
	* db2/db/db_conv.c: Likewise.
	* db2/db/db_dispatch.c: Likewise.
	* db2/db/db_dup.c: Likewise.
	* db2/db/db_overflow.c: Likewise.
	* db2/db/db_pr.c: Likewise.
	* db2/db/db_rec.c: Likewise.
	* db2/db/db_ret.c: Likewise.
	* db2/db/db_thread.c: Likewise.
	* db2/db/db_auto.c: Likewise.
	* db2/db185/db185.c: Likewise.
	* db2/db185/db185_int.h: Likewise.
	* db2/dbm/dbm.c: Likewise.
	* db2/hash/hash.c: Likewise.
	* db2/hash/hash.src: Likewise.
	* db2/hash/hash_page.c: Likewise.
	* db2/hash/hash_conv.c: Likewise.
	* db2/hash/hash_debug.c: Likewise.
	* db2/hash/hash_stat.c: Likewise.
	* db2/hash/hash_rec.c: Likewise.
	* db2/hash/hash_dup.c: Likewise.
	* db2/hash/hash_func.c: Likewise.
	* db2/hash/hash_auto.c: Likewise.
	* db2/include/mp.h: Likewise.
	* db2/include/btree.h: Likewise.
	* db2/include/db.h.src: Likewise.
	* db2/include/db_int.h.src: Likewise.
	* db2/include/db_shash.h: Likewise.
	* db2/include/db_swap.h: Likewise.
	* db2/include/db_185.h.src: Likewise.
	* db2/include/txn.h: Likewise.
	* db2/include/db_am.h: Likewise.
	* db2/include/shqueue.h: Likewise.
	* db2/include/hash.h: Likewise.
	* db2/include/db_dispatch.h: Likewise.
	* db2/include/lock.h: Likewise.
	* db2/include/db_page.h: Likewise.
	* db2/include/log.h: Likewise.
	* db2/include/db_auto.h: Likewise.
	* db2/include/btree_auto.h: Likewise.
	* db2/include/hash_auto.h: Likewise.
	* db2/include/log_auto.h: Likewise.
	* db2/include/txn_auto.h: Likewise.
	* db2/include/db_ext.h: Likewise.
	* db2/include/btree_ext.h: Likewise.
	* db2/include/clib_ext.h: Likewise.
	* db2/include/common_ext.h: Likewise.
	* db2/include/hash_ext.h: Likewise.
	* db2/include/lock_ext.h: Likewise.
	* db2/include/log_ext.h: Likewise.
	* db2/include/mp_ext.h: Likewise.
	* db2/include/mutex_ext.h: Likewise.
	* db2/include/os_ext.h: Likewise.
	* db2/include/txn_ext.h: Likewise.
	* db2/include/cxx_int.h: Likewise.
	* db2/include/db_cxx.h: Likewise.
	* db2/include/queue.h: Likewise.
	* db2/lock/lock.c: Likewise.
	* db2/lock/lock_conflict.c: Likewise.
	* db2/lock/lock_util.c: Likewise.
	* db2/lock/lock_deadlock.c: Likewise.
	* db2/log/log.c: Likewise.
	* db2/log/log_get.c: Likewise.
	* db2/log/log.src: Likewise.
	* db2/log/log_compare.c: Likewise.
	* db2/log/log_put.c: Likewise.
	* db2/log/log_rec.c: Likewise.
	* db2/log/log_archive.c: Likewise.
	* db2/log/log_register.c: Likewise.
	* db2/log/log_auto.c: Likewise.
	* db2/log/log_findckp.c: Likewise.
	* db2/mp/mp_bh.c: Likewise.
	* db2/mp/mp_fget.c: Likewise.
	* db2/mp/mp_fopen.c: Likewise.
	* db2/mp/mp_fput.c: Likewise.
	* db2/mp/mp_fset.c: Likewise.
	* db2/mp/mp_open.c: Likewise.
	* db2/mp/mp_region.c: Likewise.
	* db2/mp/mp_pr.c: Likewise.
	* db2/mp/mp_sync.c: Likewise.
	* db2/mutex/68020.gcc: Likewise.
	* db2/mutex/mutex.c: Likewise.
	* db2/mutex/README: Likewise.
	* db2/mutex/x86.gcc: Likewise.
	* db2/mutex/sparc.gcc: Likewise.
	* db2/mutex/uts4.cc.s: Likewise.
	* db2/mutex/alpha.dec: Likewise.
	* db2/mutex/alpha.gcc: Likewise.
	* db2/mutex/parisc.gcc: Likewise.
	* db2/mutex/parisc.hp: Likewise.
	* db2/os/db_os_abs.c: Likewise.
	* db2/os/db_os_dir.c: Likewise.
	* db2/os/db_os_fid.c: Likewise.
	* db2/os/db_os_lseek.c: Likewise.
	* db2/os/db_os_mmap.c: Likewise.
	* db2/os/db_os_open.c: Likewise.
	* db2/os/db_os_rw.c: Likewise.
	* db2/os/db_os_sleep.c: Likewise.
	* db2/os/db_os_stat.c: Likewise.
	* db2/os/db_os_unlink.c: Likewise.
	* db2/txn/txn.c: Likewise.
	* db2/txn/txn.src: Likewise.
	* db2/txn/txn_rec.c: Likewise.
	* db2/txn/txn_auto.c: Likewise.
	* db2/clib/getlong.c: Likewise.
	* db2/progs/db_archive/db_archive.c: Likewise.
	* db2/progs/db_checkpoint/db_checkpoint.c: Likewise.
	* db2/progs/db_deadlock/db_deadlock.c: Likewise.
	* db2/progs/db_dump/db_dump.c: Likewise.
	* db2/progs/db_dump185/db_dump185.c: Likewise.
	* db2/progs/db_load/db_load.c: Likewise.
	* db2/progs/db_printlog/db_printlog.c: Likewise.
	* db2/progs/db_recover/db_recover.c: Likewise.
	* db2/progs/db_stat/db_stat.c: Likewise.

	* libio/stdio.h [__cplusplus] (__STDIO_INLINE): Define as inline.

	* po/de.po, po/sv.po: Update from 2.0.5 translations.

	* sysdeps/unix/sysv/linux/netinet/tcp.h: Pretty print.

	* sunrpc/rpc/xdr.h (XDR): Don't define argument of x_destroy callback
	as const.
	* sunrpc/xdr_mem.c (xdrmem_destroy): Don't define argument as const.
	* sunrpx/xdr_rec.c (xdrrec_destroy): Likewise.
	* sunrpx/xdr_stdio.c (xdrstdio_destroy): Likewise.

1997-08-27 18:47  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/if_index.c: Include <errno.h>.
	Reported by Benjamin Kosnik <bkoz@cygnus.com>.

1997-08-27 02:27  Roland McGrath  <roland@baalperazim.frob.com>

	* abi-tags: New file.
	* csu/Makefile (distribute): Remove abi-tag.h.
	($(objpfx)abi-tag.h): New target.
	* Makefile (distribute): Add abi-tags.
	* sysdeps/unix/sysv/linux/abi-tag.h: File removed.
	* sysdeps/mach/hurd/abi-tag.h: File removed.
	* sysdeps/stub/abi-tag.h: File removed.

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

	* sysdeps/unix/make-syscalls.sh: Change output so that it
	generates compilation rules only for the currently selected object
	suffixes.

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

	* sysdeps/m68k/dl-machine.h (RTLD_START): Switch back to previous
	section to avoid confusing the compiler.
	* sysdeps/alpha/dl-machine.h (RTLD_START): Likewise.
	* sysdeps/i386/dl-machine.h (RTLD_START): Likewise.
	* sysdeps/mips/dl-machine.h (RTLD_START): Likewise.
	* sysdeps/mips/mips64/dl-machine.h (RTLD_START): Likewise.
	* sysdeps/sparc/sparc32/dl-machine.h (RTLD_START): Likewise.

	* sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use a GOT
	relocation instead of a constant to avoid text relocation.
	(ELF_MACHINE_BEFORE_RTLD_RELOC): Removed.
	(RTLD_START): Declare global labels as functions and add size
	directive.

1997-08-25 17:01  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/i386/bits/select.h: Correct assembler versions to work even
	for descriptors >= 32.

	* stdlib/alloca.h: Don't define alloca to __alloca since if gcc
	is used __alloca is not defined to __builtin_alloca and so might
	not be available.
	Reported by Uwe Ohse <uwe@ohse.de>.

	* sysdeps/unix/sysv/linux/sys/sysmacros.h: Define macros in a special
	way if gcc is not used and so dev_t is an array.
	Reported by Uwe Ohse <uwe@ohse.de>.

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

	* manual/libc.texinfo: Reorder chapters to match logical order.

1997-08-25 12:22  Ulrich Drepper  <drepper@cygnus.com>

	* sunrpc/rpc/xdr.h: Change name of parameters in prototypes of
	xdr_reference, xdrmem_create, and xdrstdio_create because of clash
	with g++ internal symbols.
	Patch by Sudish Joseph <sj@eng.mindspring.net>.

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

5 files changed, 1626 insertions, 20 deletions

diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index 35e0422bdb..bb2d8f7b41 100644
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -5,6 +5,10 @@ asm-CPPFLAGS := $(asm-CPPFLAGS) -DGAS_SYNTAX
 # The i386 `long double' is a distinct type we support.
 long-double-fcts = yes
 
+ifeq ($(subdir),db2)
+CPPFLAGS += -DHAVE_SPINLOCKS=1 -DHAVE_ASSEM_X86_GCC=1
+endif
+
 ifeq ($(subdir),gmon)
 sysdep_routines += i386-mcount
 endif
diff --git a/sysdeps/i386/bits/select.h b/sysdeps/i386/bits/select.h
index e72b6f0a84..8c9a5434b9 100644
--- a/sysdeps/i386/bits/select.h
+++ b/sysdeps/i386/bits/select.h
@@ -23,41 +23,45 @@
 
 #if defined __GNUC__ && __GNUC__ >= 2
 
-#define __FD_ZERO(fdsetp) \
+# define __FD_ZERO(fdsetp) \
   __asm__ __volatile__ ("cld ; rep ; stosl"				      \
 			: "=m" (*(__fd_set *) (fdsetp))			      \
 			: "a" (0), "c" (sizeof (__fd_set)		      \
 					/ sizeof (__fd_mask)),		      \
 			  "D" ((__fd_set *) (fdsetp))			      \
 			:"cx","di")
-#define __FD_SET(fd, fdsetp) \
+# define __FD_SET(fd, fdsetp) \
   __asm__ __volatile__ ("btsl %1,%0"					      \
-			: "=m" (*(__fd_set *) (fdsetp))			      \
-			: "r" ((int) (fd)))
-#define __FD_CLR(fd, fdsetp) \
+			: "=m" (((__fd_set *) (fdsetp))[__FDELT (fd)])	      \
+			: "r" (((int) (fd)) % __NFDBITS)		      \
+			: "cc")
+# define __FD_CLR(fd, fdsetp) \
   __asm__ __volatile__ ("btrl %1,%0"					      \
-			: "=m" (*(__fd_set *) (fdsetp))			      \
-			: "r" ((int) (fd)))
-#define __FD_ISSET(fd, fdsetp) \
+			: "=m" (((__fd_set *) (fdsetp))[__FDELT (fd)])	      \
+			: "r" (((int) (fd)) % __NFDBITS)		      \
+			: "cc")
+# define __FD_ISSET(fd, fdsetp) \
   (__extension__							      \
-   ({unsigned char __result;						      \
-     __asm__ __volatile__ ("btl %1,%2 ; setb %0"			      \
+   ({unsigned int __result;						      \
+     __asm__ __volatile__ ("btl %1,%2 ; setcb %b0; andl $1,%0"		      \
 			   : "=q" (__result)				      \
-			   : "r" ((int) (fd)), "m" (*(__fd_set *) (fdsetp))); \
+			   : "r" (((int) (fd)) % __NFDBITS),		      \
+			     "m" (((__fd_set *) (fdsetp))[__FDELT (fd)])      \
+			   : "cc");					      \
      __result; }))
 
 #else	/* ! GNU CC */
 
 /* We don't use `memset' because this would require a prototype and
    the array isn't too big.  */
-#define __FD_ZERO(set)  \
+# define __FD_ZERO(set)  \
   do {									      \
     unsigned int __i;							      \
     for (__i = 0; __i < sizeof (__fd_set) / sizeof (__fd_mask); ++__i)	      \
-      ((__fd_mask *) set)[__i] = '\0';					      \
+      ((__fd_mask *) set)[__i] = 0;					      \
   } while (0)
-#define __FD_SET(d, set)	((set)->fds_bits[__FDELT(d)] |= __FDMASK(d))
-#define __FD_CLR(d, set)	((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d))
-#define __FD_ISSET(d, set)	((set)->fds_bits[__FDELT(d)] & __FDMASK(d))
+# define __FD_SET(d, set)	((set)->fds_bits[__FDELT (d)] |= __FDMASK (d))
+# define __FD_CLR(d, set)	((set)->fds_bits[__FDELT (d)] &= ~__FDMASK (d))
+# define __FD_ISSET(d, set)	((set)->fds_bits[__FDELT (d)] & __FDMASK (d))
 
 #endif	/* GNU CC */
diff --git a/sysdeps/i386/bits/string.h b/sysdeps/i386/bits/string.h
new file mode 100644
index 0000000000..254db3e7f3
--- /dev/null
+++ b/sysdeps/i386/bits/string.h
@@ -0,0 +1,745 @@
+/* Optimized, inlined string functions.  i386 version.
+   Copyright (C) 1997 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _STRING_H
+#error "Never use <bits/string.h> directly; include <string.h> instead."
+#endif
+
+/* We only provide optimizations for the GNU CC.  */
+#if defined __GNUC__ && __GNUC__ >= 2
+
+#ifdef __cplusplus
+# define __STRING_INLINE inline
+#else
+# define __STRING_INLINE extern __inline
+#endif
+
+
+/* Copy N bytes of SRC to DEST.  */
+#define memcpy(dest, src, n) \
+  (__extension__ (__builtin_constant_p (n)				      \
+		  ? __memcpy_c (dest, src, n)				      \
+		  : memcpy (dest, src, n)))
+/* This looks horribly ugly, but the compiler can optimize it totally,
+   as the count is constant.  */
+__STRING_INLINE void *
+__memcpy_c (void *__dest, __const void *__src, size_t __n)
+{
+  switch (n)
+    {
+    case 0:
+      return __dest;
+    case 1:
+      *(unsigned char *) __dest = *(const unsigned char *) __src;
+      return __dest;
+    case 2:
+      *(unsigned short int *) __dest = *(const unsigned short int *) __src;
+      return __dest;
+    case 3:
+      *(unsigned short int *) __dest = *(const unsigned short int *) __src;
+      *(2 + (unsigned char *) __dest) = *(2 + (const unsigned char *) __src);
+      return __dest;
+    case 4:
+      *(unsigned long int *) __dest = *(const unsigned long int *) __src;
+      return __dest;
+    case 6:	/* for ethernet addresses */
+      *(unsigned long int *) __dest = *(const unsigned long int *) __src;
+      *(2 + (unsigned short int *) __dest) =
+	*(2 + (const unsigned short int *) __src);
+      return __dest;
+    case 8:
+      *(unsigned long int *) __dest = *(const unsigned long int *) __to;
+      *(1 + (unsigned long int *) __dest) =
+	*(1 + (const unsigned long int *) __src);
+      return __dest;
+    case 12:
+      *(unsigned long int *) __dest = *(const unsigned long int *) __src;
+      *(1 + (unsigned long int *) __dest) =
+	*(1 + (const unsigned long int *) __src);
+      *(2 + (unsigned long int *) __dest) =
+	*(2 + (const unsigned long int *) __src);
+      return __dest;
+    case 16:
+      *(unsigned long int *) __dest = *(const unsigned long int *) __src;
+      *(1 + (unsigned long int *) __dest) =
+	*(1 + (const unsigned long int *) __src);
+      *(2 + (unsigned long int *) __dest) =
+	*(2 + (const unsigned long int *) __src);
+      *(3 + (unsigned long int *) __dest) =
+	*(3 + (const unsigned long int *) __src);
+      return __dest;
+    case 20:
+      *(unsigned long int *) __dest = *(const unsigned long int *) __src;
+      *(1 + (unsigned long int *) __dest) =
+	*(1 + (const unsigned long int *) __src);
+      *(2 + (unsigned long int *) __dest) =
+	*(2 + (const unsigned long int *) __src);
+      *(3 + (unsigned long int *) __dest) =
+	*(3 + (const unsigned long int *) __src);
+      *(4 + (unsigned long int *) __dest) =
+	*(4 + (const unsigned long int *) __src);
+      return __dest;
+    }
+#define __COMMON_CODE(x) \
+  __asm__ __volatile__							      \
+    ("cld\n\t"								      \
+     "rep; movsl"							      \
+     x									      \
+     : /* no outputs */							      \
+     : "c" (n / 4), "D" (__dest), "S" (__src)				      \
+     : "cx", "di", "si", "memory");
+
+  switch (n % 4)
+    {
+    case 0:
+      __COMMON_CODE ("");
+      return __dest;
+    case 1:
+      __COMMON_CODE ("\n\tmovsb");
+      return __dest;
+    case 2:
+      __COMMON_CODE ("\n\tmovsw");
+      return __dest;
+    case 3:
+      __COMMON_CODE ("\n\tmovsw\n\tmovsb");
+      return __dest;
+    }
+#undef __COMMON_CODE
+}
+
+
+/* Copy N bytes of SRC to DEST, guaranteeing
+   correct behavior for overlapping strings.  */
+__STRING_INLINE void *
+memmove (void *__dest, __const void *__src, size_t __n)
+{
+  if (__dest < __src)
+    __asm__ __volatile__
+      ("cld\n\t"
+       "rep\n\t"
+       "movsb"
+       : /* no output */
+       : "c" (__n), "S" (__src),"D" (__dest)
+       : "cx", "si", "di");
+  else
+    __asm__ __volatile__
+      ("std\n\t"
+       "rep\n\t"
+       "movsb\n\t"
+       "cld"
+       : /* no output */
+       : "c" (__n), "S" (__n - 1 + (const char *) __src),
+	 "D" (__n - 1 + (char *) __dest)
+       : "cx", "si", "di", "memory");
+  return __dest;
+}
+
+
+/* Set N bytes of S to C.  */
+#define memset(s, c, n) \
+  (__extension__ (__builtin_constant_p (c)				      \
+		  ? (__builtin_constant_p (n)				      \
+		     ? __memset_cc (s, 0x01010101UL * (unsigned char) (c), n) \
+		     : __memset_cg (s, 0x01010101UL * (unsigned char) (c), n))\
+		  : __memset_gg (s, c, n)))
+
+__STRING_INLINE void *
+__memset_cc (void *__s, unsigned long int __pattern, size_t __n)
+{
+  switch (__n)
+    {
+    case 0:
+      return s;
+    case 1:
+      *(unsigned char *) __s = __pattern;
+      return __s;
+    case 2:
+      *(unsigned short int *) __s = __pattern;
+      return s;
+    case 3:
+      *(unsigned short int *) __s = __pattern;
+      *(2 + (unsigned char *) __s) = __pattern;
+      return __s;
+    case 4:
+      *(unsigned long *) __s = __pattern;
+      return __s;
+	}
+#define __COMMON_CODE(x) \
+  __asm__ __volatile__							      \
+    ("cld\n\t"								      \
+     "rep; stosl"							      \
+     x									      \
+     : /* no outputs */							      \
+     : "a" (__pattern),"c" (__n / 4), "D" (__s)				      \
+     : "cx", "di", "memory")
+
+  switch (__n % 4)
+    {
+    case 0:
+      __COMMON_CODE ("");
+      return __s;
+    case 1:
+      __COMMON_CODE ("\n\tstosb");
+      return __s;
+    case 2:
+      __COMMON__CODE ("\n\tstosw");
+      return s;
+    case 3:
+      __COMMON_CODE ("\n\tstosw\n\tstosb");
+      return __s;
+    }
+#undef __COMMON_CODE
+}
+
+__STRING_INLINE void *
+__memset_cg (void *__s, unsigned long __c, size_t __n)
+{
+  __asm__ __volatile__
+    ("cld\n\t"
+     "rep; stosl\n\t"
+     "testb	$2,%b1\n\t"
+     "je	1f\n\t"
+     "stosw\n"
+     "1:\n\t"
+     "testb	$1,%b1\n\t"
+     "je	2f\n\t"
+     "stosb\n"
+     "2:"
+     : /* no output */
+     : "a" (__c), "q" (__n), "c" (__n / 4), "D" (__s)
+     : "cx", "di", "memory");
+  return __s;
+}
+
+__STRING_INLINE void *
+__memset_gg (void *__s, char __c, size_t __n)
+{
+  __asm__ __volatile__
+    ("cld\n\t"
+     "rep\n\t"
+     "stosb"
+     : /* no output */
+     : "a" (__c),"D" (__s), "c" (__n)
+     : "cx", "di", "memory");
+  return __s;
+}
+
+
+
+
+/* Search N bytes of S for C.  */
+__STRING_INLINE void *
+memchr (__const void *__s, int __c, size_t __n)
+{
+  register void *__res;
+  if (count == 0)
+    return NULL;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "repne; scasb\n\t"
+     "je	1f\n\t"
+     "movl	$1,%0\n"
+     "1:\n\t"
+     "decl	%0"
+     : "=D" (__res)
+     : "a" (__c), "D" (__s), "c" (__n)
+     : "cx", "cc");
+  return __res;
+}
+
+
+/* Search N bytes of S for C.  */
+__STRING_INLINE void *
+memchr (__const void *__s, int __c, size_t __n)
+{
+  register void *__res;
+  if (count == 0)
+    return NULL;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "repne\n\t"
+     "scasb\n\t"
+     "je	1f\n\t"
+     "movl	$1,%0\n"
+     "1:"
+     : "=D" (__res)
+     : "a" (__c), "0" (__s), "c" (__n)
+     : "cx");
+  return __res - 1;
+}
+
+
+/* Return the length of S.  */
+__STRING_INLINE size_t
+strlen (__const char *__str)
+{
+  register size_t __res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "repne; scasb\n\t"
+     "notl %0"
+     : "=c" (__res)
+     : "D" (__str), "a" (0), "0" (0xffffffff)
+     : "di", "cc");
+  return __res - 1;
+}
+
+
+/* Copy SRC to DEST.  */
+__STRING_INLINE char *
+strcpy (char *__dest, __const char *__src)
+{
+  __asm__ __volatile__
+    ("cld\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "stosb\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne	1b"
+     : /* no output */
+     : "S" (__src), "D" (__dest)
+     : "si", "di", "ax", "memory", "cc");
+  return __dest;
+}
+
+
+/* Copy no more than N characters of SRC to DEST.  */
+__STRING_INLINE char *
+strncpy (char *__dest, __const char *__src, size_t __n)
+{
+  __asm__ __volatile__
+    ("cld\n"
+     "1:\n\t"
+     "decl	%2\n\t"
+     "js	2f\n\t"
+     "lodsb\n\t"
+     "stosb\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne	1b\n\t"
+     "rep; stosb\n"
+     "2:"
+     : /* no output */
+     : "S" (__src), "D" (__dest), "c" (__n)
+     : "si", "di", "ax", "cx", "memory", "cc");
+  return __dest;
+}
+
+
+/* Append SRC onto DEST.  */
+__STRING_INLINE char *
+strcat (char *__dest, __const char *__src)
+{
+  __asm__ __volatile__
+    ("cld\n\t"
+     "repne; scasb\n\t"
+     "decl	%1\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "stosb\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne	1b"
+     : /* no output */
+     : "S" (__src), "D" (__dest), "a" (0), "c" (0xffffffff)
+     : "si", "di", "ax", "cx", "memory", "cc");
+  return __dest;
+}
+
+
+/* Append no more than N characters from SRC onto DEST.  */
+__STRING_INLINE char *
+strncat (char *__dest, __const char *__src, size_t __n)
+{
+  __asm__ __volatile__
+    ("cld\n\t"
+     "repne; scasb\n\t"
+     "decl	%1\n\t"
+     "movl	%4,%3\n"
+     "1:\n\t"
+     "decl	%3\n\t"
+     "js	2f\n\t"
+     "lodsb\n\t"
+     "stosb\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne	1b\n"
+     "2:\n\t"
+     "xorl	%2,%2\n\t"
+     "stosb"
+     : /* no output */
+     : "S" (__src), "D" (__dest), "a" (0), "c" (0xffffffff), "g" (__n)
+     : "si", "di", "ax", "cx", "memory", "cc");
+  return __dest;
+}
+
+
+/* Compare S1 and S2.  */
+__STRING_INLINE int
+strcmp (__const char *__s1, __const char *__s2)
+{
+  register int __res;
+  __asm__ __volatile__
+    ("cld\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "scasb\n\t"
+     "jne	2f\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne	1b\n\t"
+     "xorl	%%eax,%%eax\n\t"
+     "jmp	3f\n"
+     "2:\n\t"
+     "sbbl	%%eax,%%eax\n\t"
+     "orb	$1,%%eax\n"
+     "3:"
+     : "=a" (__res)
+     : "S" (__s1), "D" (__s2)
+     : "si", "di", "cc");
+  return __res;
+}
+
+
+/* Compare N characters of S1 and S2.  */
+__STRING_INLINE int
+strncmp (__const char *__s1, __const char *__s2, size_t __n)
+{
+  register int __res;
+  __asm__ __volatile__
+    ("cld\n"
+     "1:\n\t"
+     "decl	%3\n\t"
+     "js	2f\n\t"
+     "lodsb\n\t"
+     "scasb\n\t"
+     "jne	3f\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne	1b\n"
+     "2:\n\t"
+     "xorl	%%eax,%%eax\n\t"
+     "jmp	4f\n"
+     "3:\n\t"
+     "sbbl	%%eax,%%eax\n\t"
+     "orb	$1,%%al\n"
+     "4:"
+     : "=a" (__res)
+     : "S" (__s1), "D" (__s2), "c" (__n)
+     : "si", "di", "cx", "cc");
+  return __res;
+}
+
+
+/* Find the first occurrence of C in S.  */
+#define strchr(s, c) \
+  (__extension__ (__builtin_constant_p (c)				      \
+		  ? __strchr_c (s, ((c) & 0xff) << 8)			      \
+		  : __strchr_g (s, c)))
+
+__STRING_INLINE char *
+__strchr_g (__const char *__s, int __c)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "movb	%%al,%%ah\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "cmpb	%%ah,%%al\n\t"
+     "je	2f\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne	1b\n\t"
+     "movl	$1,%1\n"
+     "2:\n\t"
+     "movl	%1,%0"
+     : "=a" (__res)
+     : "S" (__s), "0" (__c)
+     : "si", "cc");
+  return __res - 1;
+}
+
+__STRING_INLINE char *
+__strchr_c (__const char *__s, int __c)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "1:\n\t"
+     "lodsb\n\t"
+     "cmpb	%%ah,%%al\n\t"
+     "je	2f\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne	1b\n\t"
+     "movl	$1,%1\n"
+     "2:\n\t"
+     "movl	%1,%0"
+     : "=a" (__res)
+     : "S" (__s), "0" (__c)
+     : "si", "cc");
+  return __res - 1;
+}
+
+
+/* Return the length of the initial segment of S which
+   consists entirely of characters not in REJECT.  */
+#ifdef __PIC__
+__STRING_INLINE size_t
+strcspn (__const char *__s, __const char *__reject)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("pushl	%%ebx\n\t"
+     "cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%ebx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%ebx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "jne	1b\n"
+     "2:\n\t"
+     "popl	%%ebx"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__reject)
+     : "ax", "cx", "di", "cc");
+  return (__res - 1) - __s;
+}
+#else
+__STRING_INLINE size_t
+strcspn (__const char *__s, __const char *__reject)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%edx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%edx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "jne	1b\n"
+     "2:"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff),"0" (__s), "g" (__reject)
+     : "ax", "cx", "dx", "di", "cc");
+  return (__res - 1) - __s;
+}
+#endif
+
+
+/* Return the length of the initial segment of S which
+   consists entirely of characters in ACCEPT.  */
+#ifdef __PIC__
+__STRING_INLINE size_t
+strspn (__const char *__s, __const char *__accept)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("pushl	%%ebx\n\t"
+     "cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%ebx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%ebx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "je	1b\n"
+     "2:\n\t"
+     "popl	%%ebx"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept)
+     : "ax", "cx", "di", "cc");
+  return (__res - 1) - __s;
+}
+#else
+__STRING_INLINE size_t
+strspn (__const char *__s, __const char *__accept)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%edx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%edx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "je	1b\n"
+     "2:"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept)
+     : "ax", "cx", "dx", "di", "cc");
+  return (__res - 1) - __s;
+}
+#endif
+
+
+/* Find the first occurrence in S of any character in ACCEPT.  */
+#ifdef __PIC__
+__STRING_INLINE char *
+strpbrk (__const char *__s, __const char *__accept)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("pushl	%%ebx\n\t"
+     "cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%ebx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%ebx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "jne	1b\n\t"
+     "decl	%0\n\t"
+     "jmp	3f\n"
+     "2:\n\t"
+     "xorl	%0,%0\n"
+     "3:\n\t"
+     "popl	%%ebx"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept)
+     : "ax", "cx", "di", "cc");
+  return __res;
+}
+#else
+__STRING_INLINE char *
+strpbrk (__const char *__s, __const char *__accept)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%edx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%edx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "jne	1b\n\t"
+     "decl	%0\n\t"
+     "jmp	3f\n"
+     "2:\n\t"
+     "xorl	%0,%0\n"
+     "3:"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept)
+     : "ax", "cx", "dx", "di", "cc");
+  return __res;
+}
+#endif
+
+
+/* Find the first occurrence of NEEDLE in HAYSTACK.  */
+#ifdef __PIC__
+__STRING_INLINE char *
+strstr (__const char *__haystack, __const char *__needle)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("pushl	%%ebx\n\t"
+     "cld\n\t" \
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"	/* NOTE! This also sets Z if searchstring='' */
+     "movl	%%ecx,%%ebx\n"
+     "1:\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%esi,%%eax\n\t"
+     "movl	%%ebx,%%ecx\n\t"
+     "repe; cmpsb\n\t"
+     "je	2f\n\t"		/* also works for empty string, see above */
+     "xchgl	%%eax,%%esi\n\t"
+     "incl	%%esi\n\t"
+     "cmpb	$0,-1(%%eax)\n\t"
+     "jne	1b\n\t"
+     "xorl	%%eax,%%eax\n\t"
+     "2:\n\t"
+     "popl	%%ebx"
+     : "=a" (__res)
+     : "0" (0), "c" (0xffffffff), "S" (__haystack), "g" (__needle)
+     : "cx", "di", "si", "cc");
+  return __res;
+}
+#else
+__STRING_INLINE char *
+strstr (__const char *__haystack, __const char *__needle)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t" \
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"	/* NOTE! This also sets Z if searchstring='' */
+     "movl	%%ecx,%%edx\n"
+     "1:\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%esi,%%eax\n\t"
+     "movl	%%edx,%%ecx\n\t"
+     "repe; cmpsb\n\t"
+     "je	2f\n\t"		/* also works for empty string, see above */
+     "xchgl	%%eax,%%esi\n\t"
+     "incl	%%esi\n\t"
+     "cmpb	$0,-1(%%eax)\n\t"
+     "jne	1b\n\t"
+     "xorl	%%eax,%%eax\n\t"
+     "2:"
+     : "=a" (__res)
+     : "0" (0), "c" (0xffffffff), "S" (__haystack), "g" (__needle)
+     : "cx", "dx", "di", "si", "cc");
+  return __res;
+}
+#endif
+
+
+#undef __STRING_INLINE
+
+#endif	/* GNU CC */
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 213060ba84..f9913cf00c 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -57,10 +57,9 @@ static inline Elf32_Addr __attribute__ ((unused))
 elf_machine_load_address (void)
 {
   Elf32_Addr addr;
-  asm ("	call 1f\n"
-       "1:	popl %0\n"
-       "	subl 1b@GOT(%%ebx), %0"
-       : "=r" (addr));
+  asm ("leal _dl_start@GOTOFF(%%ebx), %0\n"
+       "subl _dl_start@GOT(%%ebx), %0"
+       : "=r" (addr) : : "cc");
   return addr;
 }
 
@@ -250,6 +249,7 @@ _dl_start_user:\n\
 	movl _dl_fini@GOT(%ebx), %edx\n\
 	# Jump to the user's entry point.\n\
 	jmp *%edi\n\
+.previous\n\
 ");
 
 /* Nonzero iff TYPE should not be allowed to resolve to one of
diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h
new file mode 100644
index 0000000000..f141bd50e1
--- /dev/null
+++ b/sysdeps/i386/i486/bits/string.h
@@ -0,0 +1,853 @@
+/* Optimized, inlined string functions.  i486 version.
+   Copyright (C) 1997 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _STRING_H
+#error "Never use <bits/string.h> directly; include <string.h> instead."
+#endif
+
+/* We only provide optimizations for the GNU CC.  */
+#if defined __GNUC__ && __GNUC__ >= 2
+
+#ifdef __cplusplus
+# define __STRING_INLINE inline
+#else
+# define __STRING_INLINE extern __inline
+#endif
+
+
+/* Copy N bytes of SRC to DEST.  */
+#define memcpy(dest, src, n) \
+  (__extension__ (__builtin_constant_p (n)				      \
+		  ? __memcpy_c (dest, src, n)				      \
+		  : __memcpy_g (dest, src, n)))
+#define __memcpy_c(dest, src, n) \
+  (((n) % 4 == 0)							      \
+   ? __memcpy_by4 (dest, src, n)					      \
+   : (((n) % 2 == 0)							      \
+      ? __memcpy_by2 (dest, src, n)					      \
+      : __memcpy_g (dest, src, n)))
+
+__STRING_INLINE void *
+__memcpy_by4 (void *__dest, __const void *__src, size_t __n)
+{
+  register void *__tmp = __dest;
+  register int __dummy1, __dummy2;
+  __asm__ __volatile__
+    ("1:\n\t"
+     "movl	(%2),%0\n\t"
+     "leal	4(%2),%2\n\t"
+     "movl	%0,(%1)\n\t"
+     "leal	4(%1),%1\n\t"
+     "decl	%3\n\t"
+     "jnz	1b"
+     : "=r" (__dummy1), "=r" (__tmp), "=r" (__src), "=r" (__dummy2)
+     : "1" (__tmp), "2" (__src), "3" (__n / 4)
+     : "memory", "cc");
+  return __dest;
+}
+
+__STRING_INLINE void *
+__memcpy_by2 (void *__dest, __const void *__src, size_t __n)
+{
+  register void *__tmp = __dest;
+  register int __dummy1, __dummy2;
+  __asm__ __volatile__
+    ("shrl	$1,%3\n\t"
+     "jz	2f\n"                 /* only a word */
+     "1:\n\t"
+     "movl	(%2),%0\n\t"
+     "leal	4(%2),%2\n\t"
+     "movl	%0,(%1)\n\t"
+     "leal	4(%1),%1\n\t"
+     "decl	%3\n\t"
+     "jnz	1b\n"
+     "2:\n\t"
+     "movw	(%2),%w0\n\t"
+     "movw	%w0,(%1)"
+     : "=q" (__dummy1), "=r" (__tmp), "=r" (__src), "=r" (__dummy2)
+     : "1" (__tmp), "2" (__src), "3" (__n / 2)
+     : "memory", "cc");
+  return __dest;
+}
+
+__STRING_INLINE void *
+__memcpy_g (void *__dest, __const void *__src, size_t __n)
+{
+  register void *__tmp = __dest;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "shrl	$1,%%ecx\n\t"
+     "jnc	1f\n\t"
+     "movsb\n"
+     "1:\n\t"
+     "shrl	$1,%%ecx\n\t"
+     "jnc	2f\n\t"
+     "movsw\n"
+     "2:\n\t"
+     "rep; movsl"
+     : /* no output */
+     : "c" (__n), "D" (__tmp),"S" (__src)
+     : "cx", "di", "si", "memory", "cc");
+  return __dest;
+}
+
+
+/* Copy N bytes of SRC to DEST, guaranteeing
+   correct behavior for overlapping strings.  */
+__STRING_INLINE void *
+memmove (void *__dest, __const void *__src, size_t __n)
+{
+  register void *__tmp = __dest;
+  if (__dest < __src)
+    __asm__ __volatile__
+      ("cld\n\t"
+       "rep; movsb"
+       : /* no output */
+       : "c" (__n), "S" (__src), "D" (__tmp)
+       : "cx", "si", "di");
+  else
+    __asm__ __volatile__
+      ("std\n\t"
+       "rep; movsb\n\t"
+       "cld"
+       : /* no output */
+       : "c" (__n), "S" (__n - 1 + (__const char *) __src),
+	 "D" (__n - 1 + (char *) __tmp)
+       : "cx", "si", "di", "memory");
+  return __dest;
+}
+
+
+/* Compare N bytes of S1 and S2.  */
+#ifndef __PIC__
+/* gcc has problems to spill registers when using PIC.  */
+__STRING_INLINE int
+memcmp (__const void *__s1, __const void *__s2, size_t __n)
+{
+  register int __res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "repe; cmpsb\n\t"
+     "je	1f\n\t"
+     "sbbl	%0,%0\n\t"
+     "orb	$1,%b0\n"
+     "1:"
+     : "=a" (__res)
+     : "0" (0), "S" (__s1), "D" (__s2), "c" (__n)
+     : "si", "di", "cx", "cc");
+  return __res;
+}
+#endif
+
+
+/* Set N bytes of S to C.  */
+#define memset(s, c, n) \
+  (__extension__ (__builtin_constant_p (c)				      \
+		  ? (__builtin_constant_p (n)				      \
+		     ? __memset_cc (s, c, n)				      \
+		     : __memset_cg (s, c, n))				      \
+		  : (__builtin_constant_p (n)				      \
+		     ? __memset_gc (s, c, n)				      \
+		     : __memset_gg (s, c, n))))
+#define __memset_cc(s, c, n) \
+  (((n) % 4 == 0)							      \
+   ? __memset_cc_by4 (s, c, n)						      \
+   : (((n) % 2== 0)							      \
+      ? __memset_cc_by2 (s, c, n)					      \
+      : __memset_cg (s, c, n)))
+#define __memset_gc(s, c, n) \
+  (((n) % 4== 0)							      \
+   ? __memset_gc_by4 (s, c, n)						      \
+   : (((n) % 2 == 0)							      \
+      ? __memset_gc_by2 (s, c, n)					      \
+      : __memset_gg (s, c, n)))
+
+__STRING_INLINE void *
+__memset_cc_by4 (void *__s, int __c, size_t __n)
+{
+  register char *__tmp = __s;
+  register int __dummy;
+  __asm__ __volatile__
+    ("1:\n\t"
+     "movl	%2,(%0)\n\t"
+     "leal	4(%0),%0\n\t"
+     "decl	%1\n\t"
+     "jnz	1b"
+     : "=r" (__tmp), "=r" (__dummy)
+     : "q" (0x01010101UL * (unsigned char) __c), "0" (__tmp), "1" (__n / 4)
+     : "memory", "cc");
+  return __s;
+}
+
+__STRING_INLINE void *
+__memset_cc_by2 (void *__s, char __c, size_t __n)
+{
+  register void *__tmp = __s;
+  register int __dummy;
+  __asm__ __volatile__
+    ("shrl	$1,%1\n\t"	/* may be divisible also by 4 */
+     "jz	2f\n"
+     "1:\n\t"
+     "movl	%2,(%0)\n\t"
+     "leal	4(%0),%0\n\t"
+     "decl	%1\n\t"
+     "jnz	1b\n"
+     "2:\n\t"
+     "movw	%w2,(%0)"
+     : "=r" (__tmp), "=r" (__dummy)
+     : "q" (0x01010101UL * (unsigned char) __c), "0" (__tmp), "1" (__n / 2)
+     : "memory", "cc");
+  return __s;
+}
+
+__STRING_INLINE void *
+__memset_gc_by4 (void *__s, char __c, size_t __n)
+{
+  register void *__tmp = __s;
+  register int __dummy;
+  __asm__ __volatile__
+    ("movb	%b0,%h0\n"
+     "pushw	%w0\n\t"
+     "shll	$16,%0\n\t"
+     "popw	%w0\n"
+     "1:\n\t"
+     "movl	%0,(%1)\n\t"
+     "addl	$4,%1\n\t"
+     "decl	%2\n\t"
+     "jnz	1b\n"
+     : "=q" (__c), "=r" (__tmp), "=r" (__dummy)
+     : "0" ((unsigned int) __c), "1" (__tmp), "2" (__n / 4)
+     : "memory", "cc");
+  return __s;
+}
+
+__STRING_INLINE void *
+__memset_gc_by2 (void *__s, char __c, size_t __n)
+{
+  register void *__tmp = __s;
+  register int __dummy1, __dummy2;
+  __asm__ __volatile__
+    ("movb	%b0,%h0\n\t"
+     "shrl	$1,%2\n\t"	/* may be divisible also by 4 */
+     "jz	2f\n\t"
+     "pushw	%w0\n\t"
+     "shll	$16,%0\n\t"
+     "popw	%w0\n"
+     "1:\n\t"
+     "movl	%0,(%1)\n\t"
+     "leal	4(%1),%1\n\t"
+     "decl	%2\n\t"
+     "jnz	1b\n"
+     "2:\n\t"
+     "movw	%w0,(%1)"
+     : "=q" (__dummy1), "=r" (__tmp), "=r" (__dummy2)
+     : "0" ((unsigned int) __c), "1" (__tmp), "2" (__n / 2)
+     : "memory", "cc");
+  return __s;
+}
+
+__STRING_INLINE void *
+__memset_cg (void *__s, char __c, size_t __n)
+{
+  register void *__tmp = __s;
+  __asm__ __volatile__
+    ("shrl	$1,%%ecx\n\t"
+     "rep; stosw\n\t"
+     "jnc	1f\n\t"
+     "movb	%%al,(%%edi)\n"
+     "1:"
+     : /* no output */
+     : "c" (__n),"D" (__tmp), "a" (0x0101U * (unsigned char) __c)
+     : "cx", "di", "memory", "cc");
+  return __s;
+}
+
+__STRING_INLINE void *
+__memset_gg (void *__s, char __c, size_t __n)
+{
+  register void *__tmp = __s;
+  __asm__ __volatile__
+    ("movb	%%al,%%ah\n\t"
+     "shrl	$1,%%ecx\n\t"
+     "rep; stosw\n\t"
+     "jnc	1f\n\t"
+     "movb	%%al,(%%edi)\n"
+     "1:"
+     : /* no output */
+     : "c" (__n), "D" (__tmp), "a" (__c)
+     : "cx", "di", "memory", "cc");
+  return __s;
+}
+
+
+/* Search N bytes of S for C.  */
+__STRING_INLINE void *
+memchr (__const void *__s, int __c, size_t __n)
+{
+  register void *__res;
+  if (__n == 0)
+    return NULL;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "repne; scasb\n\t"
+     "je	1f\n\t"
+     "movl	$1,%0\n"
+     "1:\n\t"
+     "decl	%0"
+     : "=D" (__res)
+     : "a" (__c), "D" (__s), "c" (__n)
+     : "cx", "cc");
+  return __res;
+}
+
+
+/* Return the length of S.  */
+__STRING_INLINE size_t
+strlen (__const char *__str)
+{
+  register char __dummy;
+  register __const char *__tmp = __str;
+  __asm__ __volatile__
+    ("1:\n\t"
+     "movb	(%0),%1\n\t"
+     "leal	1(%0),%0\n\t"
+     "testb	%1,%1\n\t"
+     "jne	1b"
+     : "=r" (__tmp), "=q" (__dummy)
+     : "0" (__str)
+     : "memory", "cc" );
+  return __tmp - __str - 1;
+}
+
+
+/* Copy SRC to DEST.  */
+__STRING_INLINE char *
+strcpy (char *__dest, __const char *__src)
+{
+  register char *__tmp = __dest;
+  register char __dummy;
+  __asm__ __volatile__
+    (
+     "1:\n\t"
+     "movb	(%0),%2\n\t"
+     "incl	%0\n\t"
+     "movb	%2,(%1)\n\t"
+     "incl	%1\n\t"
+     "testb	%2,%2\n\t"
+     "jne	1b"
+     : "=r" (__src), "=r" (__tmp), "=q" (__dummy)
+     : "0" (__src), "1" (__tmp)
+     : "memory", "cc");
+  return __dest;
+}
+
+
+/* Copy no more than N characters of SRC to DEST.  */
+__STRING_INLINE char *
+strncpy (char *__dest, __const char *__src, size_t __n)
+{
+  register char *__tmp = __dest;
+  register char __dummy;
+  if (__n > 0)
+    __asm__ __volatile__
+      ("1:\n\t"
+       "movb	(%0),%2\n\t"
+       "incl	%0\n\t"
+       "movb	%2,(%1)\n\t"
+       "incl	%1\n\t"
+       "decl	%3\n\t"
+       "je	3f\n\t"
+       "testb	%2,%2\n\t"
+       "jne	1b\n\t"
+       "2:\n\t"
+       "movb	%2,(%1)\n\t"
+       "incl	%1\n\t"
+       "decl	%3\n\t"
+       "jne	2b\n\t"
+       "3:"
+       : "=r" (__src), "=r" (__tmp), "=q" (__dummy), "=r" (__n)
+       : "0" (__src), "1" (__tmp), "3" (__n)
+       : "memory", "cc");
+
+  return __dest;
+}
+
+
+/* Append SRC onto DEST.  */
+__STRING_INLINE char *
+strcat (char *__dest, __const char *__src)
+{
+  register char *__tmp = __dest - 1;
+  register char __dummy;
+  __asm__ __volatile__
+    (
+     "1:\n\t"
+     "incl	%1\n\t"
+     "cmpb	$0,(%1)\n\t"
+     "jne	1b\n"
+     "2:\n\t"
+     "movb	(%2),%b0\n\t"
+     "incl	%2\n\t"
+     "movb	%b0,(%1)\n\t"
+     "incl	%1\n\t"
+     "testb	%b0,%b0\n\t"
+     "jne	2b\n"
+     : "=q" (__dummy), "=r" (__tmp), "=r" (__src)
+     : "1"  (__tmp), "2"  (__src)
+     : "memory", "cc");
+  return __dest;
+}
+
+
+/* Append no more than N characters from SRC onto DEST.  */
+__STRING_INLINE char *
+strncat (char *__dest, __const char *__src, size_t __n)
+{
+  register char *__tmp = __dest - 1;
+  register char __dummy;
+  __asm__ __volatile__
+    (
+     "1:\n\t"
+     "incl	%1\n\t"
+     "cmpb	$0,(%1)\n\t"
+     "jne	1b\n"
+     "2:\n\t"
+     "decl	%3\n\t"
+     "js	3f\n\t"
+     "movb	(%2),%b0\n\t"
+     "leal	1(%2),%2\n\t"
+     "movb	%b0,(%1)\n\t"
+     "leal	1(%1),%1\n\t"
+     "testb	%b0,%b0\n\t"
+     "jne	2b\n"
+     "3:\n\t"
+     "movb	$0,(%1)\n\t"
+     : "=q" (__dummy), "=r" (__tmp), "=r" (__src), "=r" (__n)
+     : "1" (__tmp), "2" (__src), "3" (__n)
+     : "memory", "cc");
+  return __dest;
+}
+
+
+/* Compare S1 and S2.  */
+__STRING_INLINE int
+strcmp (__const char *__s1, __const char *__s2)
+{
+  register int __res;
+  __asm__ __volatile__
+    ("1:\n\t"
+     "movb	(%1),%b0\n\t"
+     "leal	1(%1),%1\n\t"
+     "cmpb	%b0,(%2)\n\t"
+     "jne	2f\n\t"
+     "leal	1(%2),%2\n\t"
+     "testb	%b0,%b0\n\t"
+     "jne	1b\n\t"
+     "xorl	%0,%0\n\t"
+     "jmp	3f\n"
+     "2:\n\t"
+     "movl	$1,%0\n\t"
+     "jb	3f\n\t"
+     "negl	%0\n"
+     "3:"
+     : "=q" (__res), "=r" (__s1), "=r" (__s2)
+     : "1" (__s1), "2" (__s2)
+     : "cc");
+  return __res;
+}
+
+
+/* Compare N characters of S1 and S2.  */
+__STRING_INLINE int
+strncmp (__const char *__s1, __const char *__s2, size_t __n)
+{
+  register int __res;
+  __asm__ __volatile__
+    ("1:\n\t"
+     "decl	%3\n\t"
+     "js	2f\n\t"
+     "movb	(%1),%b0\n\t"
+     "incl	%1\n\t"
+     "cmpb	%b0,(%2)\n\t"
+     "jne	3f\n\t"
+     "incl	%2\n\t"
+     "testb	%b0,%b0\n\t"
+     "jne	1b\n"
+     "2:\n\t"
+     "xorl	%0,%0\n\t"
+     "jmp	4f\n"
+     "3:\n\t"
+     "movl	$1,%0\n\t"
+     "jb	4f\n\t"
+     "negl	%0\n"
+     "4:"
+     : "=q" (__res), "=r" (__s1), "=r" (__s2), "=r" (__n)
+     : "1"  (__s1), "2"  (__s2),  "3" (__n)
+     : "cc");
+  return __res;
+}
+
+
+/* Find the first occurrence of C in S.  */
+#define strchr(s, c) \
+  (__extension__ (__builtin_constant_p (c)				      \
+		  ? __strchr_c (s, ((c) & 0xff) << 8)			      \
+		  : __strchr_g (s, c)))
+
+__STRING_INLINE char *
+__strchr_g (__const char *__s, int __c)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("movb	%%al,%%ah\n"
+     "1:\n\t"
+     "movb	(%0),%%al\n\t"
+     "cmpb	%%ah,%%al\n\t"
+     "je	2f\n\t"
+     "leal	1(%0),%0\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne	1b\n\t"
+     "xorl	%0,%0\n"
+     "2:"
+     : "=r" (__res)
+     : "a" (__c), "0" (__s)
+     : "ax", "cc");
+  return __res;
+}
+
+__STRING_INLINE char *
+__strchr_c (__const char *__s, int __c)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("1:\n\t"
+     "movb	(%0),%%al\n\t"
+     "cmpb	%%ah,%%al\n\t"
+     "je	2f\n\t"
+     "leal	1(%0),%0\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne	1b\n\t"
+     "xorl	%0,%0\n"
+     "2:"
+     : "=r" (__res)
+     : "a" (__c), "0" (__s)
+     : "ax", "cc");
+  return __res;
+}
+
+
+/* Find the last occurrence of C in S.  */
+#define strrchr(s, c) \
+  (__extension__ (__builtin_constant_p (c)				      \
+		  ? __strrchr_c (s, ((c) & 0xff) << 8)			      \
+		  : __strrchr_g (s, c)))
+
+__STRING_INLINE char *
+__strrchr_g (__const char *__s, int __c)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "movb	%%al,%%ah\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "cmpb	%%ah,%%al\n\t"
+     "jne	2f\n\t"
+     "leal	-1(%%esi),%0\n"
+     "2:\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne 1b"
+     : "=d" (__res)
+     : "0" (0), "S" (__s),"a" (__c)
+     : "ax", "si", "cc");
+  return __res;
+}
+
+__STRING_INLINE char *
+__strrchr_c (__const char *__s, int __c)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "1:\n\t"
+     "lodsb\n\t"
+     "cmpb	%%ah,%%al\n\t"
+     "jne	2f\n\t"
+     "leal	-1(%%esi),%0\n"
+     "2:\n\t"
+     "testb	%%al,%%al\n\t"
+     "jne 1b"
+     : "=d" (__res)
+     : "0" (0), "S" (__s),"a" (__c)
+     : "ax", "si", "cc");
+  return __res;
+}
+
+
+/* Return the length of the initial segment of S which
+   consists entirely of characters not in REJECT.  */
+#ifdef __PIC__
+__STRING_INLINE size_t
+strcspn (__const char *__s, __const char *__reject)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("push	%%ebx\n\t"
+     "cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%ebx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%ebx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "jne	1b\n"
+     "2:\n\t"
+     "popl	%%ebx"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__reject)
+     : "ax", "cx", "di", "cc");
+  return (__res - 1) - __s;
+}
+#else
+__STRING_INLINE size_t
+strcspn (__const char *__s, __const char *__reject)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%edx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%edx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "jne	1b\n"
+     "2:"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__reject)
+     : "ax", "cx", "dx", "di", "cc");
+  return (__res - 1) - __s;
+}
+#endif
+
+
+/* Return the length of the initial segment of S which
+   consists entirely of characters in ACCEPT.  */
+#ifdef __PIC__
+__STRING_INLINE size_t
+strspn (__const char *__s, __const char *__accept)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("pushl	%%ebx\n\t"
+     "cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%ebx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%ebx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "je	1b\n"
+     "2:\n\t"
+     "popl	%%ebx"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept)
+     : "ax", "cx", "di", "cc");
+  return (__res - 1) - __s;
+}
+#else
+__STRING_INLINE size_t
+strspn (__const char *__s, __const char *__accept)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%edx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%edx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "je	1b\n"
+     "2:"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept)
+     : "ax", "cx", "dx", "di", "cc");
+  return (__res - 1) - __s;
+}
+#endif
+
+
+/* Find the first occurrence in S of any character in ACCEPT.  */
+#ifdef __PIC__
+__STRING_INLINE char *
+strpbrk (__const char *__s, __const char *__accept)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("pushl	%%ebx\n\t"
+     "cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%ebx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%ebx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "jne	1b\n\t"
+     "decl	%0\n\t"
+     "jmp	3f\n"
+     "2:\n\t"
+     "xorl	%0,%0\n"
+     "3:\n\t"
+     "popl	%%ebx"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept)
+     : "ax", "cx", "di", "cc");
+  return __res;
+}
+#else
+__STRING_INLINE char *
+strpbrk (__const char *__s, __const char *__accept)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t"
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"
+     "movl	%%ecx,%%edx\n"
+     "1:\n\t"
+     "lodsb\n\t"
+     "testb	%%al,%%al\n\t"
+     "je	2f\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%edx,%%ecx\n\t"
+     "repne; scasb\n\t"
+     "jne	1b\n\t"
+     "decl	%0\n\t"
+     "jmp	3f\n"
+     "2:\n\t"
+     "xorl	%0,%0\n"
+     "3:"
+     : "=S" (__res)
+     : "a" (0), "c" (0xffffffff), "0" (__s), "g" (__accept)
+     : "ax", "cx", "dx", "di", "cc");
+  return __res;
+}
+#endif
+
+
+/* Find the first occurrence of NEEDLE in HAYSTACK.  */
+#ifdef __PIC__
+__STRING_INLINE char *
+strstr (__const char *__haystack, __const char *__needle)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("pushl	%%ebx\n\t"
+     "cld\n\t" \
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"	/* NOTE! This also sets Z if searchstring='' */
+     "movl	%%ecx,%%ebx\n"
+     "1:\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%esi,%%eax\n\t"
+     "movl	%%ebx,%%ecx\n\t"
+     "repe; cmpsb\n\t"
+     "je	2f\n\t"		/* also works for empty string, see above */
+     "xchgl	%%eax,%%esi\n\t"
+     "incl	%%esi\n\t"
+     "cmpb	$0,-1(%%eax)\n\t"
+     "jne	1b\n\t"
+     "xorl	%%eax,%%eax\n\t"
+     "2:\n\t"
+     "popl	%%ebx"
+     : "=a" (__res)
+     : "0" (0), "c" (0xffffffff), "S" (__haystack), "g" (__needle)
+     : "cx", "di", "si", "cc");
+  return __res;
+}
+#else
+__STRING_INLINE char *
+strstr (__const char *__haystack, __const char *__needle)
+{
+  register char *__res;
+  __asm__ __volatile__
+    ("cld\n\t" \
+     "movl	%4,%%edi\n\t"
+     "repne; scasb\n\t"
+     "notl	%%ecx\n\t"
+     "decl	%%ecx\n\t"	/* NOTE! This also sets Z if searchstring='' */
+     "movl	%%ecx,%%edx\n"
+     "1:\n\t"
+     "movl	%4,%%edi\n\t"
+     "movl	%%esi,%%eax\n\t"
+     "movl	%%edx,%%ecx\n\t"
+     "repe; cmpsb\n\t"
+     "je	2f\n\t"		/* also works for empty string, see above */
+     "xchgl	%%eax,%%esi\n\t"
+     "incl	%%esi\n\t"
+     "cmpb	$0,-1(%%eax)\n\t"
+     "jne	1b\n\t"
+     "xorl	%%eax,%%eax\n\t"
+     "2:"
+     : "=a" (__res)
+     : "0" (0), "c" (0xffffffff), "S" (__haystack), "g" (__needle)
+     : "cx", "dx", "di", "si", "cc");
+  return __res;
+}
+#endif
+
+
+#undef __STRING_INLINE
+
+#endif	/* GNU CC */