about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/i386/getuid.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386/getuid.c')
-rw-r--r--sysdeps/unix/sysv/linux/i386/getuid.c35
1 files changed, 2 insertions, 33 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/getuid.c b/sysdeps/unix/sysv/linux/i386/getuid.c
index 6bbc74d4c5..67d63a416b 100644
--- a/sysdeps/unix/sysv/linux/i386/getuid.c
+++ b/sysdeps/unix/sysv/linux/i386/getuid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2003, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2012 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
@@ -21,44 +21,13 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 
-#include <kernel-features.h>
-
-#ifdef __NR_getuid32
-# if __ASSUME_32BITUIDS == 0
-/* This variable is shared with all files that need to check for 32bit
-   uids.  This is the definition.
-   -1 if libc does not know yet whether kernel has 32bit uids or not.
-   0 if it does have them.
-   1 if it does not have them.  */
-int __libc_missing_32bit_uids attribute_hidden = -1;
-# endif
-#endif /* __NR_getuid32 */
+/* Consider moving to syscalls.list.  */
 
 uid_t
 __getuid (void)
 {
   INTERNAL_SYSCALL_DECL (err);
-#if __ASSUME_32BITUIDS > 0
-  /* No error checking.  */
   return INTERNAL_SYSCALL (getuid32, err, 0);
-#else
-# ifdef __NR_getuid32
-  if (__libc_missing_32bit_uids <= 0)
-    {
-      int result;
-
-      result = INTERNAL_SYSCALL (getuid32, err, 0);
-      if (! INTERNAL_SYSCALL_ERROR_P (result, err)
-	  || INTERNAL_SYSCALL_ERRNO (result, err) != ENOSYS)
-	return result;
-
-      __libc_missing_32bit_uids = 1;
-    }
-# endif /* __NR_getuid32 */
-
-  /* No error checking.  */
-  return INTERNAL_SYSCALL (getuid, err, 0);
-#endif
 }
 
 weak_alias (__getuid, getuid)