CURBRK -> __curbrk changes from mickey, minbrk addition by me, ok mickey@

4 files changed, 28 insertions, 24 deletions

diff --git a/lib/libc/arch/amd64/sys/brk.S b/lib/libc/arch/amd64/sys/brk.S
index 1563091c7f3..3c73525096e 100644
--- a/lib/libc/arch/amd64/sys/brk.S
+++ b/lib/libc/arch/amd64/sys/brk.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brk.S,v 1.1 2004/01/28 01:44:45 mickey Exp $	*/
+/*	$OpenBSD: brk.S,v 1.2 2004/02/10 00:22:51 drahn Exp $	*/
 /*	$NetBSD: brk.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $	*/
 
 /*-
@@ -45,13 +45,15 @@
 
 	.globl	_end
 	.globl	_C_LABEL(__minbrk)
-	.globl	CURBRK
+	.globl	_C_LABEL(minbrk)
+	.globl	__curbrk
 
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(brk, _brk)
 #endif
 
 	.data
+_C_LABEL(minbrk):
 _C_LABEL(__minbrk):
 	.quad	_end
 	.text
@@ -65,7 +67,7 @@ SYSENTRY(_brk)
 1:
 	SYSTRAP(break)
 	jc	err
-	movq	PIC_GOT(CURBRK),%rdx	# set up GOT addressing
+	movq	PIC_GOT(__curbrk),%rdx	# set up GOT addressing
 	movq	%rdi,(%rdx)
 	xorl	%eax,%eax
 	ret
@@ -79,7 +81,7 @@ err:
 1:
 	SYSTRAP(break)
 	jc	err
-	movq	%rdi,CURBRK(%rip)
+	movq	%rdi,__curbrk(%rip)
 	xorl	%eax,%eax
 	ret
 err:
diff --git a/lib/libc/arch/amd64/sys/sbrk.S b/lib/libc/arch/amd64/sys/sbrk.S
index aad5f89d7d8..677068c4978 100644
--- a/lib/libc/arch/amd64/sys/sbrk.S
+++ b/lib/libc/arch/amd64/sys/sbrk.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbrk.S,v 1.1 2004/01/28 01:44:45 mickey Exp $	*/
+/*	$OpenBSD: sbrk.S,v 1.2 2004/02/10 00:22:51 drahn Exp $	*/
 /*	$NetBSD: sbrk.S,v 1.1 2001/06/19 00:25:06 fvdl Exp $	*/
 
 /*-
@@ -44,24 +44,24 @@
 #include "SYS.h"
 
 	.globl	_end
-	.globl	CURBRK
+	.globl	__curbrk
 
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(sbrk, _sbrk)
 #endif
 
 	.data
-CURBRK:	.quad	_end
+__curbrk:	.quad	_end
 	.text
 
 SYSENTRY(_sbrk)
 #ifdef PIC
-	movq	PIC_GOT(CURBRK),%rdx
+	movq	PIC_GOT(__curbrk),%rdx
 	movq	(%rdx),%rax
 	addq	%rax,%rdi
 	SYSTRAP(break)
 	jc	err
-	movq	PIC_GOT(CURBRK),%rdx
+	movq	PIC_GOT(__curbrk),%rdx
 	movq	(%rdx),%rax
 	movq	%rdi,(%rdx)
 	ret
@@ -69,13 +69,13 @@ err:
 	mov	PIC_GOT(CERROR),%rdx
 	jmp	*%rdx
 #else
-	movq	CURBRK(%rip),%rax
+	movq	__curbrk(%rip),%rax
 	movq	%rdi,%rsi
 	addq	%rax,%rdi
 	SYSTRAP(break)
 	jc	err
-	movq	CURBRK(%rip),%rax
-	addq	%rsi,CURBRK(%rip)
+	movq	__curbrk(%rip),%rax
+	addq	%rsi,__curbrk(%rip)
 	ret
 err:
 	jmp	CERROR
diff --git a/lib/libc/arch/x86_64/sys/brk.S b/lib/libc/arch/x86_64/sys/brk.S
index 1563091c7f3..3c73525096e 100644
--- a/lib/libc/arch/x86_64/sys/brk.S
+++ b/lib/libc/arch/x86_64/sys/brk.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brk.S,v 1.1 2004/01/28 01:44:45 mickey Exp $	*/
+/*	$OpenBSD: brk.S,v 1.2 2004/02/10 00:22:51 drahn Exp $	*/
 /*	$NetBSD: brk.S,v 1.2 2002/06/03 18:30:33 fvdl Exp $	*/
 
 /*-
@@ -45,13 +45,15 @@
 
 	.globl	_end
 	.globl	_C_LABEL(__minbrk)
-	.globl	CURBRK
+	.globl	_C_LABEL(minbrk)
+	.globl	__curbrk
 
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(brk, _brk)
 #endif
 
 	.data
+_C_LABEL(minbrk):
 _C_LABEL(__minbrk):
 	.quad	_end
 	.text
@@ -65,7 +67,7 @@ SYSENTRY(_brk)
 1:
 	SYSTRAP(break)
 	jc	err
-	movq	PIC_GOT(CURBRK),%rdx	# set up GOT addressing
+	movq	PIC_GOT(__curbrk),%rdx	# set up GOT addressing
 	movq	%rdi,(%rdx)
 	xorl	%eax,%eax
 	ret
@@ -79,7 +81,7 @@ err:
 1:
 	SYSTRAP(break)
 	jc	err
-	movq	%rdi,CURBRK(%rip)
+	movq	%rdi,__curbrk(%rip)
 	xorl	%eax,%eax
 	ret
 err:
diff --git a/lib/libc/arch/x86_64/sys/sbrk.S b/lib/libc/arch/x86_64/sys/sbrk.S
index aad5f89d7d8..677068c4978 100644
--- a/lib/libc/arch/x86_64/sys/sbrk.S
+++ b/lib/libc/arch/x86_64/sys/sbrk.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbrk.S,v 1.1 2004/01/28 01:44:45 mickey Exp $	*/
+/*	$OpenBSD: sbrk.S,v 1.2 2004/02/10 00:22:51 drahn Exp $	*/
 /*	$NetBSD: sbrk.S,v 1.1 2001/06/19 00:25:06 fvdl Exp $	*/
 
 /*-
@@ -44,24 +44,24 @@
 #include "SYS.h"
 
 	.globl	_end
-	.globl	CURBRK
+	.globl	__curbrk
 
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(sbrk, _sbrk)
 #endif
 
 	.data
-CURBRK:	.quad	_end
+__curbrk:	.quad	_end
 	.text
 
 SYSENTRY(_sbrk)
 #ifdef PIC
-	movq	PIC_GOT(CURBRK),%rdx
+	movq	PIC_GOT(__curbrk),%rdx
 	movq	(%rdx),%rax
 	addq	%rax,%rdi
 	SYSTRAP(break)
 	jc	err
-	movq	PIC_GOT(CURBRK),%rdx
+	movq	PIC_GOT(__curbrk),%rdx
 	movq	(%rdx),%rax
 	movq	%rdi,(%rdx)
 	ret
@@ -69,13 +69,13 @@ err:
 	mov	PIC_GOT(CERROR),%rdx
 	jmp	*%rdx
 #else
-	movq	CURBRK(%rip),%rax
+	movq	__curbrk(%rip),%rax
 	movq	%rdi,%rsi
 	addq	%rax,%rdi
 	SYSTRAP(break)
 	jc	err
-	movq	CURBRK(%rip),%rax
-	addq	%rsi,CURBRK(%rip)
+	movq	__curbrk(%rip),%rax
+	addq	%rsi,__curbrk(%rip)
 	ret
 err:
 	jmp	CERROR