diff options
Diffstat (limited to 'lib/libc')
-rw-r--r-- | lib/libc/arch/m68k/SYS.h | 6 | ||||
-rw-r--r-- | lib/libc/arch/m68k/sys/brk.S | 10 | ||||
-rw-r--r-- | lib/libc/arch/m68k/sys/cerror.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/m68k/sys/exect.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/m68k/sys/sbrk.S | 16 | ||||
-rw-r--r-- | lib/libc/arch/m68k/sys/sigprocmask.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/m68k/sys/sigreturn.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/m68k/sys/sigsuspend.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/m68k/sys/syscall.S | 4 |
9 files changed, 28 insertions, 28 deletions
diff --git a/lib/libc/arch/m68k/SYS.h b/lib/libc/arch/m68k/SYS.h index 30b245c7427..6708c564600 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.11 2002/11/03 23:58:38 marc Exp $ + * $OpenBSD: SYS.h,v 1.12 2002/11/05 00:02:17 miod Exp $ */ #include <sys/syscall.h> @@ -66,7 +66,7 @@ #define __SYSCALL(p,x,y) \ .even; \ - err: jra cerror; \ + err: jra __cerror; \ __SYSCALL_NOERROR(p,x,y); \ jcs err @@ -107,4 +107,4 @@ #define ASMSTR .asciz - .globl cerror + .globl __cerror diff --git a/lib/libc/arch/m68k/sys/brk.S b/lib/libc/arch/m68k/sys/brk.S index 440ecc89d42..61ac724fbb0 100644 --- a/lib/libc/arch/m68k/sys/brk.S +++ b/lib/libc/arch/m68k/sys/brk.S @@ -37,14 +37,14 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: brk.S,v 1.2 1996/08/19 08:15:33 tholo Exp $" + .asciz "$OpenBSD: brk.S,v 1.3 2002/11/05 00:02:20 miod Exp $" #endif /* SYSLIBC_SCCS */ #include "SYS.h" .globl _end .globl minbrk - .globl curbrk + .globl __curbrk .data minbrk: .long _end @@ -67,12 +67,12 @@ ok: trap #0 jcs err #ifdef PIC - movl a1@(curbrk:w),a0 + movl a1@(__curbrk:w),a0 movl sp@(4),a0@ #else - movl sp@(4),curbrk + movl sp@(4),__curbrk #endif clrl d0 rts err: - jra cerror + jra __cerror diff --git a/lib/libc/arch/m68k/sys/cerror.S b/lib/libc/arch/m68k/sys/cerror.S index c76ba33cc87..8669d40bdbc 100644 --- a/lib/libc/arch/m68k/sys/cerror.S +++ b/lib/libc/arch/m68k/sys/cerror.S @@ -37,14 +37,14 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: cerror.S,v 1.2 1996/08/19 08:15:33 tholo Exp $" + .asciz "$OpenBSD: cerror.S,v 1.3 2002/11/05 00:02:20 miod Exp $" #endif /* SYSLIBC_SCCS */ #include "SYS.h" .even .globl _errno -cerror: +__cerror: #ifdef PIC movl #__GLOBAL_OFFSET_TABLE_,a0 lea pc@(0,a0:l),a0 diff --git a/lib/libc/arch/m68k/sys/exect.S b/lib/libc/arch/m68k/sys/exect.S index 273863a9178..5b9df2c34f7 100644 --- a/lib/libc/arch/m68k/sys/exect.S +++ b/lib/libc/arch/m68k/sys/exect.S @@ -37,7 +37,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: exect.S,v 1.2 1996/08/19 08:15:34 tholo Exp $" + .asciz "$OpenBSD: exect.S,v 1.3 2002/11/05 00:02:20 miod Exp $" #endif /* SYSLIBC_SCCS */ #include "SYS.h" @@ -46,4 +46,4 @@ ENTRY(exect) movl #SYS_execve,d0 trap #0 - jra cerror /* exect(file, argv, env) */ + jra __cerror /* exect(file, argv, env) */ diff --git a/lib/libc/arch/m68k/sys/sbrk.S b/lib/libc/arch/m68k/sys/sbrk.S index aeb2ca2ba36..be215f2519d 100644 --- a/lib/libc/arch/m68k/sys/sbrk.S +++ b/lib/libc/arch/m68k/sys/sbrk.S @@ -37,26 +37,26 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: sbrk.S,v 1.2 1996/08/19 08:15:40 tholo Exp $" + .asciz "$OpenBSD: sbrk.S,v 1.3 2002/11/05 00:02:20 miod Exp $" #endif /* SYSLIBC_SCCS */ #include "SYS.h" .globl _end - .globl curbrk + .globl __curbrk .data -curbrk: .long _end +__curbrk:.long _end .text ENTRY(sbrk) #ifdef PIC movl #__GLOBAL_OFFSET_TABLE_,a1 lea pc@(0,a1:l),a1 - movl a1@(curbrk:w),a1 + movl a1@(__curbrk:w),a1 movl a1@,d0 #else - movl curbrk,d0 + movl __curbrk,d0 #endif addl d0,sp@(4) movl #SYS_break,d0 @@ -66,9 +66,9 @@ ENTRY(sbrk) movl a1@,d0 movl sp@(4),a1@ #else - movl curbrk,d0 - movl sp@(4),curbrk + movl __curbrk,d0 + movl sp@(4),__curbrk #endif rts err: - jra cerror + jra __cerror diff --git a/lib/libc/arch/m68k/sys/sigprocmask.S b/lib/libc/arch/m68k/sys/sigprocmask.S index 35b57ea0295..7349adea1fc 100644 --- a/lib/libc/arch/m68k/sys/sigprocmask.S +++ b/lib/libc/arch/m68k/sys/sigprocmask.S @@ -37,7 +37,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: sigprocmask.S,v 1.3 1999/01/06 23:14:17 d Exp $" + .asciz "$OpenBSD: sigprocmask.S,v 1.4 2002/11/05 00:02:20 miod Exp $" #endif /* SYSLIBC_SCCS */ #include "SYS.h" @@ -63,4 +63,4 @@ out: clrl d0 rts err: - jra cerror + jra __cerror diff --git a/lib/libc/arch/m68k/sys/sigreturn.S b/lib/libc/arch/m68k/sys/sigreturn.S index 65386275ee1..2f6b31c8f76 100644 --- a/lib/libc/arch/m68k/sys/sigreturn.S +++ b/lib/libc/arch/m68k/sys/sigreturn.S @@ -37,7 +37,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: sigreturn.S,v 1.4 2001/08/12 12:03:01 heko Exp $" + .asciz "$OpenBSD: sigreturn.S,v 1.5 2002/11/05 00:02:20 miod Exp $" #endif /* SYSLIBC_SCCS */ #include "SYS.h" @@ -56,4 +56,4 @@ SYSENTRY(sigreturn) trap #1 /* signals sigreturn() */ - jra cerror + jra __cerror diff --git a/lib/libc/arch/m68k/sys/sigsuspend.S b/lib/libc/arch/m68k/sys/sigsuspend.S index a183a9d7641..7d47e1399bf 100644 --- a/lib/libc/arch/m68k/sys/sigsuspend.S +++ b/lib/libc/arch/m68k/sys/sigsuspend.S @@ -37,7 +37,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: sigsuspend.S,v 1.3 1999/01/06 23:14:18 d Exp $" + .asciz "$OpenBSD: sigsuspend.S,v 1.4 2002/11/05 00:02:20 miod Exp $" #endif /* SYSLIBC_SCCS */ #include "SYS.h" @@ -51,4 +51,4 @@ SYSENTRY(sigsuspend) clrl d0 /* shouldn't happen */ rts err: - jra cerror + jra __cerror diff --git a/lib/libc/arch/m68k/sys/syscall.S b/lib/libc/arch/m68k/sys/syscall.S index 8773885f331..e7d6339d658 100644 --- a/lib/libc/arch/m68k/sys/syscall.S +++ b/lib/libc/arch/m68k/sys/syscall.S @@ -37,7 +37,7 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: syscall.S,v 1.3 1999/01/06 23:14:18 d Exp $" + .asciz "$OpenBSD: syscall.S,v 1.4 2002/11/05 00:02:20 miod Exp $" #endif /* SYSLIBC_SCCS */ #include "SYS.h" @@ -48,4 +48,4 @@ SYSENTRY(syscall) jcs err rts err: - jra cerror + jra __cerror |