diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2008-05-21 20:39:33 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2008-05-21 20:39:33 +0000 |
commit | 715515a321c753028cfddd435287eef6918c3da2 (patch) | |
tree | 69dffd6b7df717e219af9a47c682db3b9712ec1c /lib/libc | |
parent | 8c6ce799ad16f63e7656d04f36beebaf2a6ebff3 (diff) |
Use _C_LABEL when appropriate.
Diffstat (limited to 'lib/libc')
-rw-r--r-- | lib/libc/arch/vax/SYS.h | 8 | ||||
-rw-r--r-- | lib/libc/arch/vax/gen/_setjmp.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/vax/gen/ldexp.S | 6 | ||||
-rw-r--r-- | lib/libc/arch/vax/gen/sigsetjmp.S | 10 | ||||
-rw-r--r-- | lib/libc/arch/vax/sys/Ovfork.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/vax/sys/brk.S | 10 | ||||
-rw-r--r-- | lib/libc/arch/vax/sys/cerror.S | 8 | ||||
-rw-r--r-- | lib/libc/arch/vax/sys/exect.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/vax/sys/sbrk.S | 12 | ||||
-rw-r--r-- | lib/libc/arch/vax/sys/sigprocmask.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/vax/sys/sigsuspend.S | 4 | ||||
-rw-r--r-- | lib/libc/arch/vax/sys/syscall.S | 4 |
12 files changed, 40 insertions, 38 deletions
diff --git a/lib/libc/arch/vax/SYS.h b/lib/libc/arch/vax/SYS.h index eec7f5b7eb6..73fc812200b 100644 --- a/lib/libc/arch/vax/SYS.h +++ b/lib/libc/arch/vax/SYS.h @@ -1,4 +1,4 @@ -/* $OpenBSD: SYS.h,v 1.13 2003/06/02 20:18:33 millert Exp $ */ +/* $OpenBSD: SYS.h,v 1.14 2008/05/21 20:39:30 miod Exp $ */ /* $NetBSD: SYS.h,v 1.4 1997/05/02 18:15:32 kleink Exp $ */ /* @@ -44,13 +44,13 @@ #endif #define __SYSCALL(p,x,y) \ - err: jmp __cerror; \ + err: jmp _C_LABEL(_cerror); \ __ENTRY(p,x); \ __DO_SYSCALL(y); \ jcs err #define __PSEUDO(p,x,y) \ - err: jmp __cerror; \ + err: jmp _C_LABEL(_cerror); \ __ENTRY(p,x); \ __DO_SYSCALL(y); \ jcs err; \ @@ -85,4 +85,4 @@ __ENTRY(_thread_sys_,x) #define SYSNAME(x) _CAT(__thread_sys_,x) - .globl __cerror + .globl _C_LABEL(_cerror) diff --git a/lib/libc/arch/vax/gen/_setjmp.S b/lib/libc/arch/vax/gen/_setjmp.S index fa252fc7a23..a66d561f9b9 100644 --- a/lib/libc/arch/vax/gen/_setjmp.S +++ b/lib/libc/arch/vax/gen/_setjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: _setjmp.S,v 1.4 2005/08/07 16:40:15 espie Exp $ */ +/* $OpenBSD: _setjmp.S,v 1.5 2008/05/21 20:39:32 miod Exp $ */ /* * Copyright (c) 1980, 1993 * The Regents of the University of California. All rights reserved. @@ -87,7 +87,7 @@ done: jmp *4(r1) # done, return.... botch: - calls $0,_longjmperror + calls $0,_C_LABEL(longjmperror) halt .data diff --git a/lib/libc/arch/vax/gen/ldexp.S b/lib/libc/arch/vax/gen/ldexp.S index d16ac9ccd1f..f46904c98ae 100644 --- a/lib/libc/arch/vax/gen/ldexp.S +++ b/lib/libc/arch/vax/gen/ldexp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldexp.S,v 1.5 2005/08/07 16:40:15 espie Exp $ */ +/* $OpenBSD: ldexp.S,v 1.6 2008/05/21 20:39:32 miod Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -50,7 +50,7 @@ */ #define ERANGE 34 - .globl _errno + .globl _C_LABEL(errno) ENTRY(ldexp, R2) movd 4(ap),r0 /* fetch "value" */ @@ -72,7 +72,7 @@ ENTRY(ldexp, R2) jbc $15,4(ap),1f /* jump if argument was positive */ mnegd r0,r0 /* if arg < 0, make result negative */ 1: - movl $ ERANGE,_errno + movl $ ERANGE,_C_LABEL(errno) ret .data diff --git a/lib/libc/arch/vax/gen/sigsetjmp.S b/lib/libc/arch/vax/gen/sigsetjmp.S index 7dfebf98832..cf0d0dbcdba 100644 --- a/lib/libc/arch/vax/gen/sigsetjmp.S +++ b/lib/libc/arch/vax/gen/sigsetjmp.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsetjmp.S,v 1.4 2005/08/07 16:40:15 espie Exp $ */ +/* $OpenBSD: sigsetjmp.S,v 1.5 2008/05/21 20:39:32 miod Exp $ */ /* * Copyright (c) 1983, 1993, 1995 * The Regents of the University of California. All rights reserved. @@ -48,14 +48,14 @@ ENTRY(sigsetjmp, R6) movl 8(ap),(_JBLEN*4)(r0) # save "savemask" tstl 8(ap) # do saving of signal mask? beql L1 - jmp _setjmp+2 # yep, do full setjmp -L1: jmp __setjmp+2 # nope, skip to _setjmp + jmp _C_LABEL(setjmp)+2 # yep, do full setjmp +L1: jmp _C_LABEL(_setjmp)+2 # nope, skip to _setjmp ENTRY(siglongjmp, 0) movl 4(ap),r0 # get env pointer tstl (_JBLEN*4)(r0) # test if "savemask" was set beql L2 - jmp _longjmp+2 # yep, do full longjmp -L2: jmp __longjmp+2 # nope, skip to _longjmp + jmp _C_LABEL(longjmp)+2 # yep, do full longjmp +L2: jmp _C_LABEL(_longjmp)+2 # nope, skip to _longjmp diff --git a/lib/libc/arch/vax/sys/Ovfork.S b/lib/libc/arch/vax/sys/Ovfork.S index 87711f6ba1f..f2ab5a01f8a 100644 --- a/lib/libc/arch/vax/sys/Ovfork.S +++ b/lib/libc/arch/vax/sys/Ovfork.S @@ -1,4 +1,4 @@ -/* $OpenBSD: Ovfork.S,v 1.6 2005/08/07 16:40:16 espie Exp $ */ +/* $OpenBSD: Ovfork.S,v 1.7 2008/05/21 20:39:32 miod Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -59,6 +59,6 @@ here: jmp (r2) err: - movl r0,_errno + movl r0,_C_LABEL(errno) mnegl $1,r0 jmp (r2) diff --git a/lib/libc/arch/vax/sys/brk.S b/lib/libc/arch/vax/sys/brk.S index a927451e074..33d5849dbb8 100644 --- a/lib/libc/arch/vax/sys/brk.S +++ b/lib/libc/arch/vax/sys/brk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: brk.S,v 1.7 2005/08/07 16:40:16 espie Exp $ */ +/* $OpenBSD: brk.S,v 1.8 2008/05/21 20:39:32 miod Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -31,11 +31,11 @@ #include "SYS.h" .globl __curbrk - .globl minbrk + .globl _C_LABEL(minbrk) ENTRY(brk, 0) - cmpl minbrk,4(ap) + cmpl _C_LABEL(minbrk),4(ap) blequ ok - movl minbrk,4(ap) + movl _C_LABEL(minbrk),4(ap) ok: chmk $ SYS_break jcs err @@ -43,4 +43,4 @@ ok: clrl r0 ret err: - jmp __cerror + jmp _C_LABEL(_cerror) diff --git a/lib/libc/arch/vax/sys/cerror.S b/lib/libc/arch/vax/sys/cerror.S index 2816bab5801..f2c9f5ec411 100644 --- a/lib/libc/arch/vax/sys/cerror.S +++ b/lib/libc/arch/vax/sys/cerror.S @@ -1,4 +1,4 @@ -/* $OpenBSD: cerror.S,v 1.6 2005/08/07 16:40:16 espie Exp $ */ +/* $OpenBSD: cerror.S,v 1.7 2008/05/21 20:39:32 miod Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -30,9 +30,9 @@ #include "SYS.h" - .globl _errno -__cerror: - movl r0,_errno + .globl _C_LABEL(errno) +_C_LABEL(_cerror): + movl r0,_C_LABEL(errno) mnegl $1,r0 mnegl $1,r1 ret diff --git a/lib/libc/arch/vax/sys/exect.S b/lib/libc/arch/vax/sys/exect.S index 1cb1af9b2d4..c4776b87c6d 100644 --- a/lib/libc/arch/vax/sys/exect.S +++ b/lib/libc/arch/vax/sys/exect.S @@ -1,4 +1,4 @@ -/* $OpenBSD: exect.S,v 1.7 2005/08/07 16:40:16 espie Exp $ */ +/* $OpenBSD: exect.S,v 1.8 2008/05/21 20:39:32 miod Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -34,4 +34,4 @@ SYSENTRY(exect) bispsw $PSL_T chmk $ SYS_execve - jmp __cerror # exect(file, argv, env) + jmp _C_LABEL(_cerror) # exect(file, argv, env) diff --git a/lib/libc/arch/vax/sys/sbrk.S b/lib/libc/arch/vax/sys/sbrk.S index d2ddcedd221..ded7c12f83f 100644 --- a/lib/libc/arch/vax/sys/sbrk.S +++ b/lib/libc/arch/vax/sys/sbrk.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sbrk.S,v 1.7 2005/08/07 16:40:16 espie Exp $ */ +/* $OpenBSD: sbrk.S,v 1.8 2008/05/21 20:39:32 miod Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -32,12 +32,14 @@ .globl _end - .globl minbrk + .globl _C_LABEL(minbrk) .globl __curbrk .data -minbrk: .long _end -__curbrk:.long _end +_C_LABEL(minbrk): + .long _end +__curbrk: + .long _end .text ENTRY(sbrk, R3) @@ -51,4 +53,4 @@ ENTRY(sbrk, R3) addl2 4(r3),__curbrk ret err: - jmp __cerror + jmp _C_LABEL(_cerror) diff --git a/lib/libc/arch/vax/sys/sigprocmask.S b/lib/libc/arch/vax/sys/sigprocmask.S index 1ee870dbf9e..388bb98fcb2 100644 --- a/lib/libc/arch/vax/sys/sigprocmask.S +++ b/lib/libc/arch/vax/sys/sigprocmask.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigprocmask.S,v 1.7 2005/08/07 16:40:16 espie Exp $ */ +/* $OpenBSD: sigprocmask.S,v 1.8 2008/05/21 20:39:32 miod Exp $ */ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ #include "SYS.h" err: - jmp __cerror + jmp _C_LABEL(_cerror) SYSENTRY(sigprocmask) tstl 8(ap) # check new sigset pointer diff --git a/lib/libc/arch/vax/sys/sigsuspend.S b/lib/libc/arch/vax/sys/sigsuspend.S index 1cbebfce64b..7f2bd086459 100644 --- a/lib/libc/arch/vax/sys/sigsuspend.S +++ b/lib/libc/arch/vax/sys/sigsuspend.S @@ -1,4 +1,4 @@ -/* $OpenBSD: sigsuspend.S,v 1.7 2005/08/07 16:40:16 espie Exp $ */ +/* $OpenBSD: sigsuspend.S,v 1.8 2008/05/21 20:39:32 miod Exp $ */ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ #include "SYS.h" err: - jmp __cerror + jmp _C_LABEL(_cerror) SYSENTRY(sigsuspend) movl *4(ap),4(ap) # indirect to mask arg diff --git a/lib/libc/arch/vax/sys/syscall.S b/lib/libc/arch/vax/sys/syscall.S index 33c8008cdd7..c9a2a6d23c7 100644 --- a/lib/libc/arch/vax/sys/syscall.S +++ b/lib/libc/arch/vax/sys/syscall.S @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.S,v 1.7 2005/08/07 16:40:16 espie Exp $ */ +/* $OpenBSD: syscall.S,v 1.8 2008/05/21 20:39:32 miod Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -42,4 +42,4 @@ SYSENTRY(syscall) jcs 1f ret 1: - jmp __cerror + jmp _C_LABEL(_cerror) |