about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-24 06:02:42 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-24 13:23:10 -0700
commita7f9a9cd523d33e7b0c01dd5cd841f025bd5e3f5 (patch)
treefb9d4093322923c10d37d495daf730e6952d9299
parent042628a8d89221de70cc1c1ffb39405594b1ac29 (diff)
downloadglibc-a7f9a9cd523d33e7b0c01dd5cd841f025bd5e3f5.tar.gz
glibc-a7f9a9cd523d33e7b0c01dd5cd841f025bd5e3f5.tar.xz
glibc-a7f9a9cd523d33e7b0c01dd5cd841f025bd5e3f5.zip
Remove x32 gettimeofday.c and time.c
-rw-r--r--ChangeLog.vdso3
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/x32/gettimeofday.c35
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/x32/time.c61
3 files changed, 3 insertions, 96 deletions
diff --git a/ChangeLog.vdso b/ChangeLog.vdso
index 559ab2a23b..c42f1bf21a 100644
--- a/ChangeLog.vdso
+++ b/ChangeLog.vdso
@@ -1,5 +1,8 @@
 2012-05-23  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* sysdeps/unix/sysv/linux/x86_64/x32/gettimeofday.c: Removed.
+	* sysdeps/unix/sysv/linux/x86_64/x32/time.c: Likewise.
+
 	* include/libc-symbols.h (libc_ifunc_vdso1): Removed.
 	(libc_ifunc_vdso): Likewise.
 	(libc_ifunc_vdso_hidden): Likewise.
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/gettimeofday.c b/sysdeps/unix/sysv/linux/x86_64/x32/gettimeofday.c
deleted file mode 100644
index 994567fff6..0000000000
--- a/sysdeps/unix/sysv/linux/x86_64/x32/gettimeofday.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* The gettimeofday system call.  Linux/x32 version.
-   Copyright (C) 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
-   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, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifdef SHARED
-# include <dl-vdso.h>
-libc_ifunc_vdso (__gettimeofday, __vdso_gettimeofday)
-#else
-# include <errno.h>
-# include <sysdep.h>
-# include <sys/time.h>
-
-int
-__gettimeofday (struct timeval *tv, struct timezone *tz)
-{
-  return INLINE_SYSCALL (gettimeofday, 2, tv, tz);
-}
-#endif
-
-weak_alias (__gettimeofday, gettimeofday)
-strong_alias (__gettimeofday, __gettimeofday_internal)
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/time.c b/sysdeps/unix/sysv/linux/x86_64/x32/time.c
deleted file mode 100644
index 059cecd3ab..0000000000
--- a/sysdeps/unix/sysv/linux/x86_64/x32/time.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* The time system call.  Linux/x32 version.
-   Copyright (C) 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
-   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, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <sysdep.h>
-#include <time.h>
-
-# undef INLINE_SYSCALL
-# define INLINE_SYSCALL(name, nr, args...) \
-  ({									      \
-    unsigned long long int resultvar = INTERNAL_SYSCALL (name, , nr, args);   \
-    if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (resultvar, ), 0))	      \
-      {									      \
-	__set_errno (INTERNAL_SYSCALL_ERRNO (resultvar, ));		      \
-	resultvar = (unsigned long long int) -1LL;			      \
-      }									      \
-    (long long int) resultvar; })
-
-# undef INTERNAL_SYSCALL_NCS
-# define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
-  ({									      \
-    unsigned long long int resultvar;					      \
-    LOAD_ARGS_##nr (args)						      \
-    LOAD_REGS_##nr							      \
-    asm volatile (							      \
-    "syscall\n\t"							      \
-    : "=a" (resultvar)							      \
-    : "0" (name) ASM_ARGS_##nr : "memory", "cc", "r11", "cx");		      \
-    (long long int) resultvar; })
-
-# undef INTERNAL_SYSCALL_ERROR_P
-# define INTERNAL_SYSCALL_ERROR_P(val, err) \
-  ((unsigned long long int) (long long int) (val) >= -4095LL)
-
-#ifdef SHARED
-# include <dl-vdso.h>
-libc_ifunc_vdso_hidden (time, __vdso_time)
-#else
-time_t
-time (time_t *t)
-{
-  return INLINE_SYSCALL (time, 1, t);
-}
-#endif
-
-libc_hidden_def (time)