diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2002-10-06 23:50:41 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2002-10-06 23:50:41 +0000 |
| commit | ab554a22a337f83c5c234b548222c895c1f56494 (patch) | |
| tree | 022b76e5e688c760157f7243daeb3ec42d1f3621 /lib/libc/arch | |
| parent | 1e5212ba670dd5f1ad8c37349dae8138d52f0005 (diff) | |
curbrk -> __curbrk on sparc to avoid name space pollution.
Diffstat (limited to 'lib/libc/arch')
| -rw-r--r-- | lib/libc/arch/sparc/sys/brk.S | 10 | ||||
| -rw-r--r-- | lib/libc/arch/sparc/sys/sbrk.S | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/lib/libc/arch/sparc/sys/brk.S b/lib/libc/arch/sparc/sys/brk.S index f2f48ceafb1..c495080e99b 100644 --- a/lib/libc/arch/sparc/sys/brk.S +++ b/lib/libc/arch/sparc/sys/brk.S @@ -37,12 +37,12 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: brk.S,v 1.2 1996/08/19 08:18:02 tholo Exp $" + .asciz "$OpenBSD: brk.S,v 1.3 2002/10/06 23:50:40 art Exp $" #endif /* SYSLIBC_SCCS */ #include "SYS.h" - .globl curbrk + .globl __curbrk .globl minbrk .data @@ -62,7 +62,7 @@ ENTRY(brk) mov SYS_break, %g1 t ST_SYSCALL bcc,a 1f - ld [%o5 + curbrk], %o4 + ld [%o5 + __curbrk], %o4 ERROR() 1: retl ! success, return 0 & record new break @@ -79,9 +79,9 @@ ENTRY(brk) mov SYS_break, %g1 t ST_SYSCALL bcc,a 1f - sethi %hi(curbrk), %g1 + sethi %hi(__curbrk), %g1 ERROR() 1: retl ! success, return 0 & record new break - st %o2, [%g1 + %lo(curbrk)] + st %o2, [%g1 + %lo(__curbrk)] #endif diff --git a/lib/libc/arch/sparc/sys/sbrk.S b/lib/libc/arch/sparc/sys/sbrk.S index 2f1ed0f92a5..0a601e6da4c 100644 --- a/lib/libc/arch/sparc/sys/sbrk.S +++ b/lib/libc/arch/sparc/sys/sbrk.S @@ -37,22 +37,22 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: sbrk.S,v 1.2 1996/08/19 08:18:10 tholo Exp $" + .asciz "$OpenBSD: sbrk.S,v 1.3 2002/10/06 23:50:40 art 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 PIC_PROLOGUE(%o5,%o4) - ld [%o5 + curbrk], %o2 + ld [%o5 + __curbrk], %o2 ld [%o2], %o3 ! %o3 = old break add %o3, %o0, %o4 ! %o4 = new break mov %o4, %o0 ! copy for syscall @@ -65,8 +65,8 @@ ENTRY(sbrk) retl ! and update curbrk st %o4, [%o2] #else - sethi %hi(curbrk), %o2 - ld [%o2 + %lo(curbrk)], %o3 ! %o3 = old break + sethi %hi(__curbrk), %o2 + ld [%o2 + %lo(__curbrk)], %o3 ! %o3 = old break add %o3, %o0, %o4 ! %o4 = new break mov %o4, %o0 ! copy for syscall mov SYS_break, %g1 @@ -76,5 +76,5 @@ ENTRY(sbrk) ERROR() 1: retl ! and update curbrk - st %o4, [%o2 + %lo(curbrk)] + st %o4, [%o2 + %lo(__curbrk)] #endif |