Rename SYSEXIT() to SYSCALL_END() for consistency with most other archs.

No change in resulting object files

ok millert@

diff --git a/lib/libc/arch/amd64/SYS.h b/lib/libc/arch/amd64/SYS.h
index 0893037..9c13df1 100644 (file)
--- a/lib/libc/arch/amd64/SYS.h
+++ b/lib/libc/arch/amd64/SYS.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: SYS.h,v 1.15 2015/09/05 06:22:46 guenther Exp $       */
+/*     $OpenBSD: SYS.h,v 1.16 2015/10/17 22:40:54 guenther Exp $       */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -69,11 +69,11 @@
 #define SYSENTRY_HIDDEN(x)                                             \
        ENTRY(_thread_sys_ ## x)
 
-#define        SYSEXIT_HIDDEN(x)                                               \
+#define        SYSCALL_END_HIDDEN(x)                                           \
        END(_thread_sys_ ## x);                                         \
        _HIDDEN_FALIAS(x,_thread_sys_##x);                              \
        END(_HIDDEN(x))
-#define        SYSEXIT(x)              SYSEXIT_HIDDEN(x); END(x)
+#define        SYSCALL_END(x)          SYSCALL_END_HIDDEN(x); END(x)
 
 #define CERROR         _C_LABEL(__cerror)
 #define _CERROR                _C_LABEL(___cerror)
@@ -81,13 +81,9 @@
 #define _SYSCALL_NOERROR(x,y)                                          \
        SYSENTRY(x);                                                    \
        SYSTRAP(y)
-#define _SYSCALL_NOERROR_END(x,y)                                      \
-       SYSEXIT(x)
 #define _SYSCALL_HIDDEN_NOERROR(x,y)                                   \
        SYSENTRY_HIDDEN(x);                                             \
        SYSTRAP(y)
-#define _SYSCALL_HIDDEN_NOERROR_END(x,y)                               \
-       SYSEXIT_HIDDEN(x)
 
 #ifdef __PIC__
 #define _SYSCALL(x,y)                                                  \
@@ -115,32 +111,25 @@
        jc 2b
 #endif
 
-#define _SYSCALL_END(x,y)                                              \
-       _SYSCALL_NOERROR_END(x,y)
-#define _SYSCALL_HIDDEN_END(x,y)                                       \
-       _SYSCALL_HIDDEN_NOERROR_END(x,y)
-
 #define SYSCALL_NOERROR(x)                                             \
        _SYSCALL_NOERROR(x,x)
 
 #define SYSCALL(x)                                                     \
        _SYSCALL(x,x)
-#define SYSCALL_END(x)                                                 \
-       _SYSCALL_END(x,x)
 
 #define PSEUDO_NOERROR(x,y)                                            \
        _SYSCALL_NOERROR(x,y);                                          \
        ret;                                                            \
-       _SYSCALL_NOERROR_END(x,y)
+       SYSCALL_END(x)
 
 #define PSEUDO(x,y)                                                    \
        _SYSCALL(x,y);                                                  \
        ret;                                                            \
-       _SYSCALL_END(x,y)
+       SYSCALL_END(x)
 #define PSEUDO_HIDDEN(x,y)                                             \
        _SYSCALL_HIDDEN(x,y);                                           \
        ret;                                                            \
-       _SYSCALL_HIDDEN_END(x,y)
+       SYSCALL_END_HIDDEN(x)
 
 #define RSYSCALL_NOERROR(x)                                            \
        PSEUDO_NOERROR(x,x)

diff --git a/lib/libc/arch/amd64/sys/Ovfork.S b/lib/libc/arch/amd64/sys/Ovfork.S
index fd2b7a4..6e70f72 100644 (file)
--- a/lib/libc/arch/amd64/sys/Ovfork.S
+++ b/lib/libc/arch/amd64/sys/Ovfork.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: Ovfork.S,v 1.6 2015/09/05 06:22:47 guenther Exp $     */
+/*     $OpenBSD: Ovfork.S,v 1.7 2015/10/17 22:40:54 guenther Exp $     */
 /*     $NetBSD: Ovfork.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $  */
 
 /*-
@@ -52,4 +52,4 @@ SYSENTRY(vfork)
 #else
        jmp     CERROR
 #endif
-SYSEXIT(vfork)
+SYSCALL_END(vfork)

diff --git a/lib/libc/arch/amd64/sys/sigprocmask.S b/lib/libc/arch/amd64/sys/sigprocmask.S
index 3b2c8b2..c3c3acc 100644 (file)
--- a/lib/libc/arch/amd64/sys/sigprocmask.S
+++ b/lib/libc/arch/amd64/sys/sigprocmask.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sigprocmask.S,v 1.6 2015/09/05 06:22:47 guenther Exp $        */
+/*     $OpenBSD: sigprocmask.S,v 1.7 2015/10/17 22:40:54 guenther Exp $        */
 /*     $NetBSD: sigprocmask.S,v 1.1 2001/06/19 00:25:06 fvdl Exp $     */
 
 /*-
@@ -60,4 +60,4 @@ out:
 #else
        jmp     CERROR
 #endif
-SYSEXIT(sigprocmask)
+SYSCALL_END(sigprocmask)

diff --git a/lib/libc/arch/amd64/sys/sigsuspend.S b/lib/libc/arch/amd64/sys/sigsuspend.S
index 0c0c32b..43e6ac3 100644 (file)
--- a/lib/libc/arch/amd64/sys/sigsuspend.S
+++ b/lib/libc/arch/amd64/sys/sigsuspend.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sigsuspend.S,v 1.5 2015/09/05 06:22:47 guenther Exp $ */
+/*     $OpenBSD: sigsuspend.S,v 1.6 2015/10/17 22:40:54 guenther Exp $ */
 /*     $NetBSD: sigsuspend.S,v 1.1 2001/06/19 00:25:07 fvdl Exp $      */
 
 /*-
@@ -52,4 +52,4 @@ SYSENTRY(sigsuspend)
 #else
        jmp     CERROR
 #endif
-SYSEXIT(sigsuspend)
+SYSCALL_END(sigsuspend)

diff --git a/lib/libc/arch/amd64/sys/syscall.S b/lib/libc/arch/amd64/sys/syscall.S
index 64a0d10..0bf3ccf 100644 (file)
--- a/lib/libc/arch/amd64/sys/syscall.S
+++ b/lib/libc/arch/amd64/sys/syscall.S
@@ -1,4 +1,4 @@
-/*     $OpenBSD: syscall.S,v 1.6 2015/09/05 06:22:47 guenther Exp $    */
+/*     $OpenBSD: syscall.S,v 1.7 2015/10/17 22:40:54 guenther Exp $    */
 /*     $NetBSD: syscall.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $ */
 
 /*-
@@ -52,4 +52,4 @@ SYSENTRY(syscall)
 #else
        jmp     CERROR
 #endif
-SYSEXIT(syscall)
+SYSCALL_END(syscall)