projects / external / glibc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 54915e9)
Update.
authorUlrich Drepper <drepper@redhat.com>
Thu, 23 Sep 2004 05:17:06 +0000 (05:17 +0000)
committerUlrich Drepper <drepper@redhat.com>
Thu, 23 Sep 2004 05:17:06 +0000 (05:17 +0000)
2004-09-23  Jakub Jelinek  <jakub@redhat.com>

* sysdeps/unix/alpha/sysdep.h (inline_syscall[0-6]): Change name
argument to numbers from syscall names.
(INLINE_SYSCALL1): Pass __NR_##name to inline_syscall##nr.
(INTERNAL_SYSCALL_NCS): Renamed from...
(INTERNAL_SYSCALL_1): ... this.  Use INTERNAL_SYSCALL_NCS.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
(INTERNAL_SYSCALL_NCS): Define.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
(INTERNAL_SYSCALL_NCS): Likewise.
* sysdeps/unix/sysv/linux/sparc/sysdep.h (inline_syscall[0-6]):
Change name argument to numbers from syscall names.
(INLINE_SYSCALL, INTERNAL_SYSCALL): Adjust.
(INTERNAL_SYSCALL_NCS): Define.

ChangeLog patch | blob | history
sysdeps/unix/alpha/sysdep.h patch | blob | history
sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h patch | blob | history
sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h patch | blob | history
sysdeps/unix/sysv/linux/sparc/sysdep.h patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index a23d0a1..aeb4726 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2004-09-23  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/unix/alpha/sysdep.h (inline_syscall[0-6]): Change name
+       argument to numbers from syscall names.
+       (INLINE_SYSCALL1): Pass __NR_##name to inline_syscall##nr.
+       (INTERNAL_SYSCALL_NCS): Renamed from...
+       (INTERNAL_SYSCALL_1): ... this.  Use INTERNAL_SYSCALL_NCS.
+       * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
+       (INTERNAL_SYSCALL_NCS): Define.
+       * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
+       (INTERNAL_SYSCALL_NCS): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/sysdep.h (inline_syscall[0-6]):
+       Change name argument to numbers from syscall names.
+       (INLINE_SYSCALL, INTERNAL_SYSCALL): Adjust.
+       (INTERNAL_SYSCALL_NCS): Define.
+
 2004-09-22  Ulrich Drepper  <drepper@redhat.com>
 
        * malloc/malloc.c (malloc_printerr): Use syslog if writev failed.
diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h
index f60eafe..5378f81 100644 (file)
--- a/sysdeps/unix/alpha/sysdep.h
+++ b/sysdeps/unix/alpha/sysdep.h
@@ -167,7 +167,7 @@ __LABEL(name)                                               \
 #define INLINE_SYSCALL1(name, nr, args...)     \
 ({                                             \
        long _sc_ret, _sc_err;                  \
-       inline_syscall##nr(name, args);         \
+       inline_syscall##nr(__NR_##name, args);  \
        if (__builtin_expect (_sc_err, 0))      \
          {                                     \
            __set_errno (_sc_ret);              \
@@ -180,6 +180,9 @@ __LABEL(name)                                               \
        INTERNAL_SYSCALL1(name, err_out, nr, args)
 
 #define INTERNAL_SYSCALL1(name, err_out, nr, args...)  \
+       INTERNAL_SYSCALL_NCS(__NR_##name, err_out, nr, args)
+
+#define INTERNAL_SYSCALL_NCS(name, err_out, nr, args...) \
 ({                                                     \
        long _sc_ret, _sc_err;                          \
        inline_syscall##nr(name, args);                 \
@@ -223,7 +226,7 @@ __LABEL(name)                                               \
        register long _sc_0 inline_syscall_r0_asm;              \
        register long _sc_19 __asm__("$19");                    \
                                                                \
-       _sc_0 = __NR_##name;                                    \
+       _sc_0 = name;                                           \
        __asm__ __volatile__                                    \
          ("callsys # %0 %1 <= %2"                              \
           : inline_syscall_r0_out_constraint (_sc_0),          \
@@ -240,7 +243,7 @@ __LABEL(name)                                               \
        register long _sc_16 __asm__("$16");                    \
        register long _sc_19 __asm__("$19");                    \
                                                                \
-       _sc_0 = __NR_##name;                                    \
+       _sc_0 = name;                                           \
        _sc_16 = (long) (arg1);                                 \
        __asm__ __volatile__                                    \
          ("callsys # %0 %1 <= %2 %3"                           \
@@ -259,7 +262,7 @@ __LABEL(name)                                               \
        register long _sc_17 __asm__("$17");                    \
        register long _sc_19 __asm__("$19");                    \
                                                                \
-       _sc_0 = __NR_##name;                                    \
+       _sc_0 = name;                                           \
        _sc_16 = (long) (arg1);                                 \
        _sc_17 = (long) (arg2);                                 \
        __asm__ __volatile__                                    \
@@ -280,7 +283,7 @@ __LABEL(name)                                               \
        register long _sc_18 __asm__("$18");                    \
        register long _sc_19 __asm__("$19");                    \
                                                                \
-       _sc_0 = __NR_##name;                                    \
+       _sc_0 = name;                                           \
        _sc_16 = (long) (arg1);                                 \
        _sc_17 = (long) (arg2);                                 \
        _sc_18 = (long) (arg3);                                 \
@@ -303,7 +306,7 @@ __LABEL(name)                                               \
        register long _sc_18 __asm__("$18");                    \
        register long _sc_19 __asm__("$19");                    \
                                                                \
-       _sc_0 = __NR_##name;                                    \
+       _sc_0 = name;                                           \
        _sc_16 = (long) (arg1);                                 \
        _sc_17 = (long) (arg2);                                 \
        _sc_18 = (long) (arg3);                                 \
@@ -328,7 +331,7 @@ __LABEL(name)                                               \
        register long _sc_19 __asm__("$19");                    \
        register long _sc_20 __asm__("$20");                    \
                                                                \
-       _sc_0 = __NR_##name;                                    \
+       _sc_0 = name;                                           \
        _sc_16 = (long) (arg1);                                 \
        _sc_17 = (long) (arg2);                                 \
        _sc_18 = (long) (arg3);                                 \
@@ -355,7 +358,7 @@ __LABEL(name)                                               \
        register long _sc_20 __asm__("$20");                    \
        register long _sc_21 __asm__("$21");                    \
                                                                \
-       _sc_0 = __NR_##name;                                    \
+       _sc_0 = name;                                           \
        _sc_16 = (long) (arg1);                                 \
        _sc_17 = (long) (arg2);                                 \
        _sc_18 = (long) (arg3);                                 \
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
index d759e4a..55a2cd7 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000,01,02,03 Free Software Foundation, Inc.
+/* Copyright (C) 2000,01,02,03,04 Free Software Foundation, Inc.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
    This file is part of the GNU C Library.
 
@@ -207,7 +207,20 @@
     asm volatile (                                                           \
     "svc    0\n\t"                                                           \
     : "=d" (_ret)                                                            \
-    : "d" (_nr), "i" (__NR_##name) ASMFMT_##nr                               \
+    : "d" (_nr) ASMFMT_##nr                                                  \
+    : "memory" );                                                            \
+    _ret; })
+
+#undef INTERNAL_SYSCALL_NCS
+#define INTERNAL_SYSCALL_NCS(no, err, nr, args...)                           \
+  ({                                                                         \
+    DECLARGS_##nr(args)                                                              \
+    register unsigned long _nr asm("1") = (unsigned long)(no);               \
+    register int _ret asm("2");                                                      \
+    asm volatile (                                                           \
+    "svc    0\n\t"                                                           \
+    : "=d" (_ret)                                                            \
+    : "d" (_nr) ASMFMT_##nr                                                  \
     : "memory" );                                                            \
     _ret; })
 
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
index f0d7cbe..c7f3a03 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
@@ -1,5 +1,5 @@
 /* Assembler macros for 64 bit S/390.
-   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
    This file is part of the GNU C Library.
 
@@ -209,7 +209,20 @@
     asm volatile (                                                           \
     "svc    0\n\t"                                                           \
     : "=d" (_ret)                                                            \
-    : "d" (_nr), "i" (__NR_##name) ASMFMT_##nr                               \
+    : "d" (_nr) ASMFMT_##nr                                                  \
+    : "memory" );                                                            \
+    _ret; })
+
+#undef INTERNAL_SYSCALL_NCS
+#define INTERNAL_SYSCALL_NCS(no, err, nr, args...)                           \
+  ({                                                                         \
+    DECLARGS_##nr(args)                                                              \
+    register unsigned long _nr asm("1") = (unsigned long)(no);               \
+    register long _ret asm("2");                                             \
+    asm volatile (                                                           \
+    "svc    0\n\t"                                                           \
+    : "=d" (_ret)                                                            \
+    : "d" (_nr) ASMFMT_##nr                                                  \
     : "memory" );                                                            \
     _ret; })
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sysdep.h
index 707109b..a609379 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2000.
 
@@ -22,13 +22,17 @@
 
 #undef INLINE_SYSCALL
 #define INLINE_SYSCALL(name, nr, args...) \
-  inline_syscall##nr(__SYSCALL_STRING, name, args)
+  inline_syscall##nr(__SYSCALL_STRING, __NR_##name, args)
 
 #undef INTERNAL_SYSCALL_DECL
 #define INTERNAL_SYSCALL_DECL(err) do { } while (0)
 
 #undef INTERNAL_SYSCALL
 #define INTERNAL_SYSCALL(name, err, nr, args...) \
+  inline_syscall##nr(__INTERNAL_SYSCALL_STRING, __NR_##name, args)
+
+#undef INTERNAL_SYSCALL_NCS
+#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \
   inline_syscall##nr(__INTERNAL_SYSCALL_STRING, name, args)
 
 #undef INTERNAL_SYSCALL_ERROR_P
@@ -41,7 +45,7 @@
 #define inline_syscall0(string,name,dummy...)                          \
 ({                                                                     \
        register long __o0 __asm__ ("o0");                              \
-       register long __g1 __asm__ ("g1") = __NR_##name;                \
+       register long __g1 __asm__ ("g1") = name;                       \
        __asm __volatile (string : "=r" (__g1), "=r" (__o0) :           \
                          "0" (__g1) :                                  \
                          __SYSCALL_CLOBBERS);                          \
@@ -51,7 +55,7 @@
 #define inline_syscall1(string,name,arg1)                              \
 ({                                                                     \
        register long __o0 __asm__ ("o0") = (long)(arg1);               \
-       register long __g1 __asm__ ("g1") = __NR_##name;                \
+       register long __g1 __asm__ ("g1") = name;                       \
        __asm __volatile (string : "=r" (__g1), "=r" (__o0) :           \
                          "0" (__g1), "1" (__o0) :                      \
                          __SYSCALL_CLOBBERS);                          \
@@ -62,7 +66,7 @@
 ({                                                                     \
        register long __o0 __asm__ ("o0") = (long)(arg1);               \
        register long __o1 __asm__ ("o1") = (long)(arg2);               \
-       register long __g1 __asm__ ("g1") = __NR_##name;                \
+       register long __g1 __asm__ ("g1") = name;                       \
        __asm __volatile (string : "=r" (__g1), "=r" (__o0) :           \
                          "0" (__g1), "1" (__o0), "r" (__o1) :          \
                          __SYSCALL_CLOBBERS);                          \
@@ -74,7 +78,7 @@
        register long __o0 __asm__ ("o0") = (long)(arg1);               \
        register long __o1 __asm__ ("o1") = (long)(arg2);               \
        register long __o2 __asm__ ("o2") = (long)(arg3);               \
-       register long __g1 __asm__ ("g1") = __NR_##name;                \
+       register long __g1 __asm__ ("g1") = name;                       \
        __asm __volatile (string : "=r" (__g1), "=r" (__o0) :           \
                          "0" (__g1), "1" (__o0), "r" (__o1),           \
                          "r" (__o2) :                                  \
@@ -88,7 +92,7 @@
        register long __o1 __asm__ ("o1") = (long)(arg2);               \
        register long __o2 __asm__ ("o2") = (long)(arg3);               \
        register long __o3 __asm__ ("o3") = (long)(arg4);               \
-       register long __g1 __asm__ ("g1") = __NR_##name;                \
+       register long __g1 __asm__ ("g1") = name;                       \
        __asm __volatile (string : "=r" (__g1), "=r" (__o0) :           \
                          "0" (__g1), "1" (__o0), "r" (__o1),           \
                          "r" (__o2), "r" (__o3) :                      \
@@ -103,7 +107,7 @@
        register long __o2 __asm__ ("o2") = (long)(arg3);               \
        register long __o3 __asm__ ("o3") = (long)(arg4);               \
        register long __o4 __asm__ ("o4") = (long)(arg5);               \
-       register long __g1 __asm__ ("g1") = __NR_##name;                \
+       register long __g1 __asm__ ("g1") = name;                       \
        __asm __volatile (string : "=r" (__g1), "=r" (__o0) :           \
                          "0" (__g1), "1" (__o0), "r" (__o1),           \
                          "r" (__o2), "r" (__o3), "r" (__o4) :          \
@@ -119,7 +123,7 @@
        register long __o3 __asm__ ("o3") = (long)(arg4);               \
        register long __o4 __asm__ ("o4") = (long)(arg5);               \
        register long __o5 __asm__ ("o5") = (long)(arg6);               \
-       register long __g1 __asm__ ("g1") = __NR_##name;                \
+       register long __g1 __asm__ ("g1") = name;                       \
        __asm __volatile (string : "=r" (__g1), "=r" (__o0) :           \
                          "0" (__g1), "1" (__o0), "r" (__o1),           \
                          "r" (__o2), "r" (__o3), "r" (__o4),           \
Domain: System / Toolchain;