diff options
| author | Marco S Hyman <marc@cvs.openbsd.org> | 2002-11-03 23:58:40 +0000 |
|---|---|---|
| committer | Marco S Hyman <marc@cvs.openbsd.org> | 2002-11-03 23:58:40 +0000 |
| commit | cdbe8f98f1aaa4cc2ae34992b7621c49424b54df (patch) | |
| tree | 759f651ba7c936d05138249d22d57ce2fcaeaca0 /lib/libc/arch | |
| parent | 664e44eac173bd00d9757c4d15084393436fcbdc (diff) | |
back out previous patch.. there are still some vax/m68k issues
Diffstat (limited to 'lib/libc/arch')
| -rw-r--r-- | lib/libc/arch/m68k/SYS.h | 14 | ||||
| -rw-r--r-- | lib/libc/arch/vax/SYS.h | 15 |
2 files changed, 27 insertions, 2 deletions
diff --git a/lib/libc/arch/m68k/SYS.h b/lib/libc/arch/m68k/SYS.h index 5cfcbb066b7..30b245c7427 100644 --- a/lib/libc/arch/m68k/SYS.h +++ b/lib/libc/arch/m68k/SYS.h @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: SYS.h,v 1.10 2002/11/03 20:36:43 marc Exp $ + * $OpenBSD: SYS.h,v 1.11 2002/11/03 23:58:38 marc Exp $ */ #include <sys/syscall.h> @@ -83,6 +83,7 @@ rts +#ifdef _THREAD_SAFE /* * For the thread_safe versions, we prepend _thread_sys_ to the function * name so that the 'C' wrapper can go around the real name. @@ -92,6 +93,17 @@ # define PSEUDO(x,y) __PSEUDO(_thread_sys_,x,y) # define PSEUDO_NOERROR(x,y) __PSEUDO_NOERROR(_thread_sys_,x,y) # define SYSENTRY(x) __ENTRY(_thread_sys_,x) +#else /* _THREAD_SAFE */ +/* + * The non-threaded library defaults to traditional syscalls where + * the function name matches the syscall name. + */ +# define SYSCALL(x) __SYSCALL(,x,x) +# define RSYSCALL(x) __PSEUDO(,x,x) +# define PSEUDO(x,y) __PSEUDO(,x,y) +# define PSEUDO_NOERROR(x,y) __PSEUDO_NOERROR(,x,y) +# define SYSENTRY(x) __ENTRY(,x) +#endif /* _THREAD_SAFE */ #define ASMSTR .asciz diff --git a/lib/libc/arch/vax/SYS.h b/lib/libc/arch/vax/SYS.h index 76531dfdbda..916853c1a36 100644 --- a/lib/libc/arch/vax/SYS.h +++ b/lib/libc/arch/vax/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.9 2002/11/03 20:36:43 marc Exp $ */ +/* $OpenBSD: SYS.h,v 1.10 2002/11/03 23:58:39 marc Exp $ */ /* $NetBSD: SYS.h,v 1.4 1997/05/02 18:15:32 kleink Exp $ */ /* @@ -65,6 +65,7 @@ __DO_SYSCALL(y); \ ret +#ifdef _THREAD_SAFE /* * For the thread_safe versions, we prepend _thread_sys_ to the function * name so that the 'C' wrapper can go around the real name. @@ -75,5 +76,17 @@ #define PSEUDO_NOERROR(x,y) __PSEUDO_NOERROR(_thread_sys_,x,y) #define SYSENTRY(x) __ENTRY(_thread_sys_,x) #define SYSNAME(x) _CAT(__thread_sys_,x) +#else _THREAD_SAFE +/* + * The non-threaded library defaults to traditional syscalls where + * the function name matches the syscall name. + */ +#define SYSCALL(x) __SYSCALL(,x,x) +#define RSYSCALL(x) __PSEUDO(,x,x) +#define PSEUDO(x,y) __PSEUDO(,x,y) +#define PSEUDO_NOERROR(x,y) __PSEUDO_NOERROR(,x,y) +#define SYSENTRY(x) __ENTRY(,x) +#define SYSNAME(x) _CAT(_,x) +#endif _THREAD_SAFE .globl cerror |