diff options
| author |   art <art@openbsd.org> | 2002-10-06 23:31:41 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2002-10-06 23:31:41 +0000 |
| commit | 6121b4dff48190bbe532afa1e204e188406b03be (patch) | |
| tree | 455dc2ed33af21e21a5f0d91440e64062d6227b9 | |
| parent | Rename curbrk to __curbrk on alpha to avoid namespace pollution. (diff) | |
| download | wireguard-openbsd-6121b4dff48190bbe532afa1e204e188406b03be.tar.xz wireguard-openbsd-6121b4dff48190bbe532afa1e204e188406b03be.zip | |
Rename curbrk to __curbrk on i386 to avoid namespace pollution.
| -rw-r--r-- | lib/libc/arch/i386/sys/brk.S | 8 | ||||
| -rw-r--r-- | lib/libc/arch/i386/sys/sbrk.S | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/lib/libc/arch/i386/sys/brk.S b/lib/libc/arch/i386/sys/brk.S index 58e78c33570..2692ca01949 100644 --- a/lib/libc/arch/i386/sys/brk.S +++ b/lib/libc/arch/i386/sys/brk.S @@ -38,12 +38,12 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: brk.S,v 1.4 2002/10/06 23:24:13 art Exp $" + .asciz "$OpenBSD: brk.S,v 1.5 2002/10/06 23:31:41 art Exp $" #endif /* SYSLIB_SCCS */ .globl _end .globl minbrk - .globl curbrk + .globl __curbrk .data minbrk: .long _end @@ -64,7 +64,7 @@ ENTRY(brk) int $0x80 jc err PIC_PROLOGUE - movl PIC_GOT(curbrk),%edx # set up GOT addressing + movl PIC_GOT(__curbrk),%edx # set up GOT addressing PIC_EPILOGUE xorl %eax,%eax movl %ecx,(%edx) @@ -84,7 +84,7 @@ err: int $0x80 jc err xorl %eax,%eax - movl %ecx,curbrk + movl %ecx,__curbrk ret err: jmp __cerror diff --git a/lib/libc/arch/i386/sys/sbrk.S b/lib/libc/arch/i386/sys/sbrk.S index 45dbe92fa8b..f5000be04c4 100644 --- a/lib/libc/arch/i386/sys/sbrk.S +++ b/lib/libc/arch/i386/sys/sbrk.S @@ -38,21 +38,21 @@ #if defined(SYSLIBC_SCCS) .text - .asciz "$OpenBSD: sbrk.S,v 1.4 2002/10/06 23:24:13 art Exp $" + .asciz "$OpenBSD: sbrk.S,v 1.5 2002/10/06 23:31:41 art Exp $" #endif /* SYSLIBC_SCCS */ .globl _end - .globl curbrk + .globl __curbrk .data -curbrk: .long _end +__curbrk: .long _end .text ENTRY(sbrk) #ifdef PIC movl 4(%esp),%ecx PIC_PROLOGUE - movl PIC_GOT(curbrk),%edx + movl PIC_GOT(__curbrk),%edx PIC_EPILOGUE movl (%edx),%eax addl %eax,4(%esp) @@ -60,7 +60,7 @@ ENTRY(sbrk) int $0x80 jc err PIC_PROLOGUE - movl PIC_GOT(curbrk),%edx + movl PIC_GOT(__curbrk),%edx PIC_EPILOGUE movl (%edx),%eax addl %ecx,(%edx) @@ -71,13 +71,13 @@ err: #else movl 4(%esp),%ecx - movl curbrk,%eax + movl __curbrk,%eax addl %eax,4(%esp) movl $(SYS_break),%eax int $0x80 jc err - movl curbrk,%eax - addl %ecx,curbrk + movl __curbrk,%eax + addl %ecx,__curbrk ret err: jmp __cerror |