about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/tile/sysdep.h
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.com>2015-04-17 10:58:31 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2015-05-26 10:10:36 -0300
commitf534255e4d276ee7b20b45637d16a00b122e5df3 (patch)
treeabbedc3d05bdfb526d0171fccd87fb84ecb1acd9 /sysdeps/unix/sysv/linux/tile/sysdep.h
parent829a679fac1fe173e81cb2c08204d2da86cf3f3a (diff)
downloadglibc-f534255e4d276ee7b20b45637d16a00b122e5df3.tar.gz
glibc-f534255e4d276ee7b20b45637d16a00b122e5df3.tar.xz
glibc-f534255e4d276ee7b20b45637d16a00b122e5df3.zip
Consolidate vDSO macros and usage
This patch consolidate the Linux vDSO define and usage across all ports
that uses it.  The common vDSO definitions and calling through
{INLINE/INTERNAL}_VSYSCALL macros are moved to a common header
sysdep-vdso.h and vDSO name declaration and prototype is defined
using a common macro.

Also PTR_{MANGLE,DEMANGLE} is added to ports that does not use them
for vDSO calls (aarch64, powerpc, s390, and tile) and thus it will
reflect in code changes.  For ports that already implement pointer
mangling/demangling in vDSO system (i386, x32, x86_64) this patch
is mainly a code refactor.

Checked on x32, x86_64, x32, ppc64le, and aarch64.
Diffstat (limited to 'sysdeps/unix/sysv/linux/tile/sysdep.h')
-rw-r--r--sysdeps/unix/sysv/linux/tile/sysdep.h68
1 files changed, 8 insertions, 60 deletions
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h
index 64c8920645..30d52e32c9 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep.h
@@ -202,71 +202,19 @@
   "=R02" (_clobber_r2), "=R03" (_clobber_r3), "=R04" (_clobber_r4),     \
     "=R05" (_clobber_r5), "=R10" (_clobber_r10)
 
-/* This version is for kernels that implement system calls that
-   behave like function calls as far as register saving.
-   It falls back to the syscall in the case that the vDSO doesn't
-   exist or fails for ENOSYS */
-# ifdef SHARED
-#  define INLINE_VSYSCALL(name, nr, args...) \
-  ({									      \
-    __label__ out;							      \
-    __label__ iserr;							      \
-    INTERNAL_SYSCALL_DECL (sc_err);					      \
-    long int sc_ret;							      \
-									      \
-    __typeof (__vdso_##name) vdsop = __vdso_##name;			      \
-    if (vdsop != NULL)							      \
-      {									      \
-        struct syscall_return_value rv = vdsop (args);			      \
-        sc_ret = rv.value;						      \
-        sc_err = rv.error;						      \
-        if (!INTERNAL_SYSCALL_ERROR_P (sc_ret, sc_err))			      \
-          goto out;							      \
-        if (INTERNAL_SYSCALL_ERRNO (sc_ret, sc_err) != ENOSYS)		      \
-          goto iserr;							      \
-      }									      \
-									      \
-    sc_ret = INTERNAL_SYSCALL (name, sc_err, nr, ##args);		      \
-    if (INTERNAL_SYSCALL_ERROR_P (sc_ret, sc_err))			      \
-      {									      \
-      iserr:								      \
-        __set_errno (INTERNAL_SYSCALL_ERRNO (sc_ret, sc_err));		      \
-        sc_ret = -1L;							      \
-      }									      \
-  out:									      \
-    sc_ret;								      \
-  })
-#  define INTERNAL_VSYSCALL(name, err, nr, args...) \
-  ({									      \
-    __label__ out;							      \
-    long int v_ret;							      \
-									      \
-    __typeof (__vdso_##name) vdsop = __vdso_##name;			      \
-    if (vdsop != NULL)							      \
-      {									      \
-        struct syscall_return_value rv = vdsop (args);			      \
-        v_ret = rv.value;						      \
-        err = rv.error;							      \
-        if (!INTERNAL_SYSCALL_ERROR_P (v_ret, err)			      \
-            || INTERNAL_SYSCALL_ERRNO (v_ret, err) != ENOSYS)		      \
-          goto out;							      \
-      }									      \
-    v_ret = INTERNAL_SYSCALL (name, err, nr, ##args);			      \
-  out:									      \
-    v_ret;								      \
-  })
 
-# else
-#  define INLINE_VSYSCALL(name, nr, args...) \
-  INLINE_SYSCALL (name, nr, ##args)
-#  define INTERNAL_VSYSCALL(name, err, nr, args...) \
-  INTERNAL_SYSCALL (name, err, nr, ##args)
-# endif
-#endif /* not __ASSEMBLER__ */
+#define INTERNAL_VSYSCALL_CALL(funcptr, err, nr, args...)		     \
+  ({									     \
+     struct syscall_return_value rv = funcptr (args);			     \
+     err = rv.error;							     \
+     rv.value;								     \
+  })
 
 /* List of system calls which are supported as vsyscalls.  */
 #define HAVE_CLOCK_GETTIME_VSYSCALL	1
 
+#endif /* __ASSEMBLER__  */
+
 /* Pointer mangling support.  */
 #if IS_IN (rtld)
 /* We cannot use the thread descriptor because in ld.so we use setjmp