Subversion Repositories or1k

diff -Nur glibc-2.3.1.old/elf/dynamic-link.h glibc-2.3.1/elf/dynamic-link.h
--- glibc-2.3.1.old/elf/dynamic-link.h	2002-09-27 04:46:27.000000000 +0200
+++ glibc-2.3.1/elf/dynamic-link.h	2005-06-27 23:24:47.000000000 +0200
@@ -266,12 +266,7 @@
 
 /* This can't just be an inline function because GCC is too dumb
    to inline functions containing inlines themselves.  */
-# define ELF_DYNAMIC_RELOCATE(map, lazy, consider_profile) \
-  do {									      \
-    int edr_lazy = elf_machine_runtime_setup ((map), (lazy),		      \
-					      (consider_profile));	      \
-    ELF_DYNAMIC_DO_REL ((map), edr_lazy);				      \
-    ELF_DYNAMIC_DO_RELA ((map), edr_lazy);				      \
-  } while (0)
+# define ELF_DYNAMIC_RELOCATE(map, lazy, consider_profile) 0
+/* FIXME */
 
 #endif
diff -Nur glibc-2.3.1.old/libio/iofflush.c glibc-2.3.1/libio/iofflush.c
--- glibc-2.3.1.old/libio/iofflush.c	2002-02-25 06:21:51.000000000 +0100
+++ glibc-2.3.1/libio/iofflush.c	2005-06-23 17:56:40.000000000 +0200
@@ -53,5 +53,6 @@
 
 #ifndef _IO_MTSAFE_IO
 weak_alias (_IO_fflush, fflush_unlocked)
+libc_hidden_weak (fflush_unlocked)
 #endif
 #endif
diff -Nur glibc-2.3.1.old/libio/iofwrite.c glibc-2.3.1/libio/iofwrite.c
--- glibc-2.3.1.old/libio/iofwrite.c	2002-08-10 20:08:29.000000000 +0200
+++ glibc-2.3.1/libio/iofwrite.c	2005-06-23 17:56:41.000000000 +0200
@@ -58,5 +58,6 @@
 libc_hidden_weak (fwrite)
 # ifndef _IO_MTSAFE_IO
 weak_alias (_IO_fwrite, fwrite_unlocked)
+libc_hidden_weak (fwrite_unlocked)
 # endif
 #endif
diff -Nur glibc-2.3.1.old/socket/sys/socket.h glibc-2.3.1/socket/sys/socket.h
--- glibc-2.3.1.old/socket/sys/socket.h	2001-07-07 21:21:17.000000000 +0200
+++ glibc-2.3.1/socket/sys/socket.h	2005-07-04 00:13:42.000000000 +0200
@@ -62,7 +62,9 @@
    uses with any of the listed types to be allowed without complaint.
    G++ 2.7 does not support transparent unions so there we want the
    old-style declaration, too.  */
-#if defined __cplusplus || !__GNUC_PREREQ (2, 7) || !defined __USE_GNU
+#if 1
+/* FIXME: the new-style declarations conflict with our implementation of
+   INLINE_SYSCALL */
 # define __SOCKADDR_ARG		struct sockaddr *__restrict
 # define __CONST_SOCKADDR_ARG	__const struct sockaddr *
 #else
diff -Nur glibc-2.3.1.old/stdio-common/sscanf.c glibc-2.3.1/stdio-common/sscanf.c
--- glibc-2.3.1.old/stdio-common/sscanf.c	2002-08-10 20:09:08.000000000 +0200
+++ glibc-2.3.1/stdio-common/sscanf.c	2005-06-23 18:38:10.000000000 +0200
@@ -27,9 +27,7 @@
 /* Read formatted input from S, according to the format string FORMAT.  */
 /* VARARGS2 */
 int
-sscanf (s, format)
-     const char *s;
-     const char *format;
+sscanf (const char *s, const char *format, ...)
 {
   va_list arg;
   int done;
diff -Nur glibc-2.3.1.old/sysdeps/generic/check_fds.c glibc-2.3.1/sysdeps/generic/check_fds.c
--- glibc-2.3.1.old/sysdeps/generic/check_fds.c	2002-04-14 20:27:21.000000000 +0200
+++ glibc-2.3.1/sysdeps/generic/check_fds.c	2005-06-27 22:43:55.000000000 +0200
@@ -47,7 +47,8 @@
       /* Something is wrong with this descriptor, it's probably not
 	 opened.  Open /dev/null so that the SUID program we are
 	 about to start does not accidently use this descriptor.  */
-      int nullfd = __libc_open (_PATH_DEVNULL, mode);
+      /* FIXME: what's the prob with __libc_open ?!? */
+      int nullfd = open (_PATH_DEVNULL, mode);
       /* We are very paranoid here.  With all means we try to ensure
 	 that we are actually opening the /dev/null device and nothing
 	 else.
diff -Nur glibc-2.3.1.old/sysdeps/generic/clone.c glibc-2.3.1/sysdeps/generic/clone.c
--- glibc-2.3.1.old/sysdeps/generic/clone.c	1970-01-01 01:00:00.000000000 +0100
+++ glibc-2.3.1/sysdeps/generic/clone.c	2005-06-24 01:16:47.000000000 +0200
@@ -0,0 +1,32 @@
+/* Copyright (C) 1991, 1995, 1996, 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <unistd.h>
+
+
+int
+__clone ()
+{
+  __set_errno (ENOSYS);
+  return -1;
+}
+stub_warning (clone)
+
+weak_alias (__clone, clone)
+#include <stub-tag.h>
diff -Nur glibc-2.3.1.old/sysdeps/generic/dl-cache.c glibc-2.3.1/sysdeps/generic/dl-cache.c
--- glibc-2.3.1.old/sysdeps/generic/dl-cache.c	2002-02-06 18:23:41.000000000 +0100
+++ glibc-2.3.1/sysdeps/generic/dl-cache.c	2005-06-27 23:17:12.000000000 +0200
@@ -208,7 +208,7 @@
       unsigned long int *hwcap;
       uint64_t platform;
 #ifndef SHARED
-      weak_extern (_dl_hwcap);
+/* FIXME */
 #endif
 
       /* This is where the strings start.  */
@@ -217,7 +217,7 @@
       /* Now we can compute how large the string table is.  */
       cache_data_size = (const char *) cache + cachesize - cache_data;
 
-      hwcap = &GL(dl_hwcap);
+      hwcap = NULL;  /* FIXME */
       platform = _dl_string_platform (GL(dl_platform));
       if (platform != -1)
 	platform = 1ULL << platform;
diff -Nur glibc-2.3.1.old/sysdeps/generic/initfini.c glibc-2.3.1/sysdeps/generic/initfini.c
--- glibc-2.3.1.old/sysdeps/generic/initfini.c	2001-09-25 03:13:41.000000000 +0200
+++ glibc-2.3.1/sysdeps/generic/initfini.c	2005-06-26 04:07:08.000000000 +0200
@@ -65,11 +65,13 @@
 static void
 call_gmon_start(void)
 {
+#ifdef PROF
   extern void __gmon_start__ (void) __attribute__ ((weak)); /*weak_extern (__gmon_start__);*/
   void (*gmon_start) (void) = __gmon_start__;
 
   if (gmon_start)
     gmon_start ();
+#endif
 }
 
 SECTION (".init");
diff -Nur glibc-2.3.1.old/sysdeps/generic/libc-start.c glibc-2.3.1/sysdeps/generic/libc-start.c
--- glibc-2.3.1.old/sysdeps/generic/libc-start.c	2002-09-15 20:53:15.000000000 +0200
+++ glibc-2.3.1/sysdeps/generic/libc-start.c	2005-07-03 15:42:09.000000000 +0200
@@ -94,10 +95,12 @@
      we need to setup errno.  If there is no thread library and we
      handle TLS the function is defined in the libc to initialized the
      TLS handling.  */
+#ifdef USE_TLS
 # if !(USE_TLS - 0)
   if (__pthread_initialize_minimal)
 # endif
     __pthread_initialize_minimal ();
+#endif
 
   /* Some security at this point.  Prevent starting a SUID binary where
      the standard file descriptors are not opened.  We have to do this
diff -Nur glibc-2.3.1.old/sysdeps/generic/mount.c glibc-2.3.1/sysdeps/generic/mount.c
--- glibc-2.3.1.old/sysdeps/generic/mount.c	1970-01-01 01:00:00.000000000 +0100
+++ glibc-2.3.1/sysdeps/generic/mount.c	2005-06-25 16:17:13.000000000 +0200
@@ -0,0 +1,33 @@
+/* Copyright (C) 2005 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <unistd.h>
+
+int
+__mount (const char *__special_file, const char *__dir,
+	 const char *__fstype, unsigned long int __rwflag,
+	 const void *__data)
+{
+  __set_errno (ENOSYS);
+  return -1;
+}
+weak_alias (__mount, mount);
+
+stub_warning (mount)
+#include <stub-tag.h>
diff -Nur glibc-2.3.1.old/sysdeps/generic/swapon.c glibc-2.3.1/sysdeps/generic/swapon.c
--- glibc-2.3.1.old/sysdeps/generic/swapon.c	2001-07-07 21:21:22.000000000 +0200
+++ glibc-2.3.1/sysdeps/generic/swapon.c	2005-06-24 01:13:30.000000000 +0200
@@ -23,8 +23,7 @@
 /* Make the block special device PATH available to the system for swapping.
    This call is restricted to the super-user.  */
 int
-swapon (path)
-     const char *path;
+swapon (const char *path, int flags)
 {
   __set_errno (ENOSYS);
   return -1;
diff -Nur glibc-2.3.1.old/sysdeps/generic/umount.c glibc-2.3.1/sysdeps/generic/umount.c
--- glibc-2.3.1.old/sysdeps/generic/umount.c	1970-01-01 01:00:00.000000000 +0100
+++ glibc-2.3.1/sysdeps/generic/umount.c	2005-06-25 16:17:08.000000000 +0200
@@ -0,0 +1,31 @@
+/* Copyright (C) 2005 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <unistd.h>
+
+int
+__umount (const char *name)
+{
+  __set_errno (ENOSYS);
+  return -1;
+}
+weak_alias (__umount, umount);
+
+stub_warning (umount)
+#include <stub-tag.h>
diff -Nur glibc-2.3.1.old/sysdeps/generic/umount2.c glibc-2.3.1/sysdeps/generic/umount2.c
--- glibc-2.3.1.old/sysdeps/generic/umount2.c	1970-01-01 01:00:00.000000000 +0100
+++ glibc-2.3.1/sysdeps/generic/umount2.c	2005-06-25 16:19:06.000000000 +0200
@@ -0,0 +1,31 @@
+/* Copyright (C) 2005 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <unistd.h>
+
+int
+__umount2 (const char *name, int flags)
+{
+  __set_errno (ENOSYS);
+  return -1;
+}
+weak_alias (__umount2, umount2);
+
+stub_warning (umount2)
+#include <stub-tag.h>
diff -Nur glibc-2.3.1.old/sysdeps/posix/open64.c glibc-2.3.1/sysdeps/posix/open64.c
--- glibc-2.3.1.old/sysdeps/posix/open64.c	2002-08-02 23:46:59.000000000 +0200
+++ glibc-2.3.1/sysdeps/posix/open64.c	2005-06-27 22:44:53.000000000 +0200
@@ -35,7 +35,8 @@
       va_end (arg);
     }
 
-  return __libc_open (file, oflag | O_LARGEFILE, mode);
+  /* FIXME: what's the prob with __libc_open ?!? */
+  return open (file, oflag | O_LARGEFILE, mode);
 }
 weak_alias (__libc_open64, BP_SYM (__open64))
 libc_hidden_weak (BP_SYM (__open64))
diff -Nur glibc-2.3.1.old/sysdeps/unix/fork.S glibc-2.3.1/sysdeps/unix/fork.S
--- glibc-2.3.1.old/sysdeps/unix/fork.S	2002-08-26 23:16:13.000000000 +0200
+++ glibc-2.3.1/sysdeps/unix/fork.S	1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-/* Copyright (C) 1991,92,94,95,97,2002 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 Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sysdep.h>
-
-/* This code works for at least m68k.  */
-
-SYSCALL__ (fork, 0)
-	/* R1 is now 0 for the parent and 1 for the child.  Decrement it to
-	   make it -1 (all bits set) for the parent, and 0 (no bits set)
-	   for the child.  Then AND it with R0, so the parent gets
-	   R0&-1==R0, and the child gets R0&0==0.  */
-	subl #1, r1
-	andl r1, r0
-	ret
-PSEUDO_END (__fork)
-
-weak_alias (__fork, fork)
diff -Nur glibc-2.3.1.old/sysdeps/unix/getegid.S glibc-2.3.1/sysdeps/unix/getegid.S
--- glibc-2.3.1.old/sysdeps/unix/getegid.S	2001-07-07 21:21:29.000000000 +0200
+++ glibc-2.3.1/sysdeps/unix/getegid.S	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-/* Copyright (C) 1991, 1992, 1995, 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 Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sysdep.h>
-
-#ifdef	SYS_getegid
-SYSCALL__ (getegid, 0)
-#else
-PSEUDO (__getegid, getgid, 0)
-	MOVE(r1, r0)
-#endif
-	ret
-PSEUDO_END(__getegid)
-
-weak_alias (__getegid, getegid)
diff -Nur glibc-2.3.1.old/sysdeps/unix/geteuid.S glibc-2.3.1/sysdeps/unix/geteuid.S
--- glibc-2.3.1.old/sysdeps/unix/geteuid.S	2001-07-07 21:21:29.000000000 +0200
+++ glibc-2.3.1/sysdeps/unix/geteuid.S	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-/* Copyright (C) 1991, 1992, 1995, 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 Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sysdep.h>
-
-#ifdef	SYS_geteuid
-SYSCALL__ (geteuid, 0)
-#else
-PSEUDO (__geteuid, getuid, 0)
-	MOVE(r1, r0)
-#endif
-	ret
-PSEUDO_END(__geteuid)
-
-weak_alias (__geteuid, geteuid)
diff -Nur glibc-2.3.1.old/sysdeps/unix/getppid.S glibc-2.3.1/sysdeps/unix/getppid.S
--- glibc-2.3.1.old/sysdeps/unix/getppid.S	2001-07-07 21:21:29.000000000 +0200
+++ glibc-2.3.1/sysdeps/unix/getppid.S	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-/* Copyright (C) 1991, 1992, 1995, 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 Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sysdep.h>
-
-#ifdef	SYS_getppid
-SYSCALL__ (getppid, 0)
-#else
-PSEUDO (__getppid, getpid, 0)
-	MOVE(r1, r0)
-#endif
-	ret
-PSEUDO_END(__getppid)
-
-weak_alias (__getppid, getppid)
diff -Nur glibc-2.3.1.old/sysdeps/unix/syscall.S glibc-2.3.1/sysdeps/unix/syscall.S
--- glibc-2.3.1.old/sysdeps/unix/syscall.S	2001-07-07 21:21:29.000000000 +0200
+++ glibc-2.3.1/sysdeps/unix/syscall.S	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-/* Copyright (C) 1993, 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 Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sysdep.h>
-
-#ifndef SYS_syscall
-#define SYS_syscall	0
-#endif
-
-/* This works if the kernel does an "indirect system call" for system call 0,
-   taking the first argument word off the stack as the system call number.  */
-
-SYSCALL (syscall, 1)
-	ret
-PSEUDO_END(syscall)
diff -Nur glibc-2.3.1.old/sysdeps/unix/sysv/linux/bits/errno.h glibc-2.3.1/sysdeps/unix/sysv/linux/bits/errno.h
--- glibc-2.3.1.old/sysdeps/unix/sysv/linux/bits/errno.h	2002-08-29 01:39:22.000000000 +0200
+++ glibc-2.3.1/sysdeps/unix/sysv/linux/bits/errno.h	2005-06-23 18:15:12.000000000 +0200
@@ -40,6 +40,9 @@
 #  if !defined _LIBC || defined _LIBC_REENTRANT
 /* When using threads, errno is a per-thread value.  */
 #   define errno (*__errno_location ())
+#  else
+#   define errno errno
+    extern int errno;
 #  endif
 # endif /* !__ASSEMBLER__ */
 #endif /* _ERRNO_H */
diff -Nur glibc-2.3.1.old/sysdeps/unix/sysv/linux/setegid.c glibc-2.3.1/sysdeps/unix/sysv/linux/setegid.c
--- glibc-2.3.1.old/sysdeps/unix/sysv/linux/setegid.c	2002-08-13 16:29:42.000000000 +0200
+++ glibc-2.3.1/sysdeps/unix/sysv/linux/setegid.c	2005-07-03 23:32:24.000000000 +0200
@@ -20,10 +20,12 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <sysdep.h>
 
 #ifdef __NR_setresgid
 
-extern int __setresgid (gid_t rgid, gid_t egid, gid_t sgid);
+//extern int __setresgid (gid_t rgid, gid_t egid, gid_t sgid);
+#define __setresgid(a,b,c) INLINE_SYSCALL(setresgid,3,a,b,c)
 
 int
 setegid (gid_t gid)
diff -Nur glibc-2.3.1.old/sysdeps/unix/sysv/linux/seteuid.c glibc-2.3.1/sysdeps/unix/sysv/linux/seteuid.c
--- glibc-2.3.1.old/sysdeps/unix/sysv/linux/seteuid.c	2002-08-13 16:29:42.000000000 +0200
+++ glibc-2.3.1/sysdeps/unix/sysv/linux/seteuid.c	2005-06-27 23:29:21.000000000 +0200
@@ -20,12 +20,14 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <sysdep.h>
 
 #include "kernel-features.h"
 
 #if defined __NR_setresuid || __ASSUME_SETRESUID_SYSCALL > 0
 
-extern int __setresuid (uid_t ruid, uid_t euid, uid_t suid);
+// extern int __setresuid (uid_t ruid, uid_t euid, uid_t suid);
+#define __setresuid(a,b,c) INLINE_SYSCALL(setresuid,3,a,b,c)
 
 int
 seteuid (uid_t uid)
diff -Nur glibc-2.3.1.old/sysdeps/unix/sysv/linux/umount.S glibc-2.3.1/sysdeps/unix/sysv/linux/umount.S
--- glibc-2.3.1.old/sysdeps/unix/sysv/linux/umount.S	1998-08-20 21:15:40.000000000 +0200
+++ glibc-2.3.1/sysdeps/unix/sysv/linux/umount.S	1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-/* This hack is necessary since the kernel people are making "strange"
-   changes.  They simply rename old system calls.  */
-
-#include <sysdep.h>
-#ifdef __NR_oldumount
-PSEUDO (__umount, oldumount, 1)
-#else
-PSEUDO (__umount, umount, 1)
-#endif
-	ret
-PSEUDO_END(__umount)
-weak_alias (__umount, umount)
diff -Nur glibc-2.3.1.old/sysdeps/unix/sysv/linux/umount2.S glibc-2.3.1/sysdeps/unix/sysv/linux/umount2.S
--- glibc-2.3.1.old/sysdeps/unix/sysv/linux/umount2.S	1998-08-20 21:15:49.000000000 +0200
+++ glibc-2.3.1/sysdeps/unix/sysv/linux/umount2.S	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-/* umount system call with two parameters.  */
-
-#include <sysdep.h>
-#if defined __NR_oldumount || defined __NR_umount2
-#ifdef __NR_oldumount
-PSEUDO (__umount2, umount, 2)
-#else
-PSEUDO (__umount2, umount2, 2)
-#endif
-	ret
-PSEUDO_END(__umount2)
-weak_alias (__umount2, umount2)
-#endif