Module Name: src
Committed By: matt
Date: Tue Jul 16 22:18:14 UTC 2013
Modified Files:
src/lib/libc/arch/m68k: SYS.h
Log Message:
Make CERROR hidden. Use END() appropriately.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/arch/m68k/SYS.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/m68k/SYS.h
diff -u src/lib/libc/arch/m68k/SYS.h:1.16 src/lib/libc/arch/m68k/SYS.h:1.17
--- src/lib/libc/arch/m68k/SYS.h:1.16 Thu Aug 7 16:42:09 2003
+++ src/lib/libc/arch/m68k/SYS.h Tue Jul 16 22:18:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: SYS.h,v 1.16 2003/08/07 16:42:09 agc Exp $ */
+/* $NetBSD: SYS.h,v 1.17 2013/07/16 22:18:14 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -45,23 +45,15 @@
#define SYSTRAP(x) movl #SYS_/**/x,%d0; trap #0
#endif
-#ifdef __ELF__
#define CERROR _C_LABEL(__cerror)
-#define CURBRK _C_LABEL(__curbrk)
-#else
-#define CERROR _ASM_LABEL(cerror)
-#define CURBRK _ASM_LABEL(curbrk)
-#endif
#define _SYSCALL_NOERROR(x,y) \
ENTRY(x); \
SYSTRAP(y)
#define _SYSCALL(x,y) \
- .even; \
- err: jra PIC_PLT(CERROR); \
_SYSCALL_NOERROR(x,y); \
- jcs err
+ jcc CERROR
#define SYSCALL_NOERROR(x) \
_SYSCALL_NOERROR(x,x)
@@ -71,11 +63,13 @@
#define PSEUDO_NOERROR(x,y) \
_SYSCALL_NOERROR(x,y); \
- rts
+ rts; \
+ END(x)
#define PSEUDO(x,y) \
_SYSCALL(x,y); \
- rts
+ rts; \
+ END(x)
#define RSYSCALL_NOERROR(x) \
PSEUDO_NOERROR(x,x)
@@ -95,3 +89,4 @@
#define ASMSTR .asciz
.globl CERROR
+ .hidden CERROR
