Thinko in previous: we do always use an internal name.

2000-06-26 06:25:36 +00:00 · 2000-06-26 06:25:36 +00:00 · 15bc7ed349
commit 15bc7ed349
parent 8bab1c8bba
24 changed files with 73 additions and 140 deletions
--- a/lib/libc/arch/alpha/sys/brk.S
+++ b/lib/libc/arch/alpha/sys/brk.S
@ -1,4 +1,4 @@
-/* $NetBSD: brk.S,v 1.7 2000/06/23 15:40:36 kleink Exp $ */
+/* $NetBSD: brk.S,v 1.8 2000/06/26 06:25:36 kleink Exp $ */

 /*
 * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@ -41,11 +41,7 @@ EXPORT(__minbrk)
 	.quad	_end

 	.text
-#ifdef WEAK_ALIAS
 LEAF(_brk, 1)
-#else
-LEAF(brk, 1)
-#endif
 	br	pv, L1				/* XXX profiling */
 L1:	LDGP(pv)
 	ldq	v0, __minbrk
--- a/lib/libc/arch/alpha/sys/sbrk.S
+++ b/lib/libc/arch/alpha/sys/sbrk.S
@ -1,4 +1,4 @@
-/* $NetBSD: sbrk.S,v 1.7 2000/06/23 15:40:36 kleink Exp $ */
+/* $NetBSD: sbrk.S,v 1.8 2000/06/26 06:25:36 kleink Exp $ */

 /*
 * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@ -40,11 +40,7 @@ EXPORT(__curbrk)
 	.quad	_end

 	.text
-#ifdef WEAK_ALIAS
 LEAF(_sbrk, 1)
-#else
-LEAF(sbrk, 1)
-#endif
 	br	pv, L1				/* XXX profiling */
 L1:	LDGP(pv)
 	ldq	a1, __curbrk
--- a/lib/libc/arch/arm26/sys/brk.S
+++ b/lib/libc/arch/arm26/sys/brk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: brk.S,v 1.2 2000/06/23 15:40:37 kleink Exp $	*/
+/*	$NetBSD: brk.S,v 1.3 2000/06/26 06:25:38 kleink Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -40,6 +40,10 @@
 	.globl	_end
 	.globl	curbrk

+#ifdef WEAK_ALIAS
+WEAK_ALIAS(brk, _brk)
+#endif
+
 	.data
 	.align	0
 	.globl	_C_LABEL(__minbrk)
@ -50,12 +54,7 @@ _C_LABEL(__minbrk):
 /*
 * Change the data segment size
 */
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
 ENTRY(_brk)
-#else
-ENTRY(brk)
-#endif
 #ifdef PIC
 	/* Setup the GOT */
 	ldr	r3, Lgot
--- a/lib/libc/arch/arm26/sys/sbrk.S
+++ b/lib/libc/arch/arm26/sys/sbrk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sbrk.S,v 1.2 2000/06/23 15:40:37 kleink Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.3 2000/06/26 06:25:38 kleink Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -39,6 +39,10 @@

 	.globl	_C_LABEL(end)

+#ifdef WEAK_ALIAS
+WEAK_ALIAS(sbrk, _sbrk)
+#endif
+
 	.data
 	.align	0
 	.globl	curbrk
@ -49,12 +53,7 @@ curbrk:
 /*
 * Change the data segment size
 */
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
 ENTRY(_sbrk)
-#else
-ENTRY(sbrk)
-#endif
 #ifdef PIC
 	/* Setup the GOT */
 	ldr	r3, Lgot
--- a/lib/libc/arch/arm32/sys/brk.S
+++ b/lib/libc/arch/arm32/sys/brk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: brk.S,v 1.7 2000/06/23 15:40:37 kleink Exp $	*/
+/*	$NetBSD: brk.S,v 1.8 2000/06/26 06:25:39 kleink Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -40,6 +40,10 @@
 	.globl	_end
 	.globl	curbrk

+#ifdef WEAK_ALIAS
+WEAK_ALIAS(brk, _brk)
+#endif
+
 	.data
 	.align	0
 	.globl	_C_LABEL(__minbrk)
@ -50,12 +54,7 @@ _C_LABEL(__minbrk):
 /*
 * Change the data segment size
 */
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
 ENTRY(_brk)
-#else
-ENTRY(brk)
-#endif
 #ifdef PIC
 	/* Setup the GOT */
 	ldr	r3, Lgot
--- a/lib/libc/arch/arm32/sys/sbrk.S
+++ b/lib/libc/arch/arm32/sys/sbrk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sbrk.S,v 1.5 2000/06/23 15:40:37 kleink Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.6 2000/06/26 06:25:39 kleink Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -39,6 +39,10 @@

 	.globl	_end

+#ifdef WEAK_ALIAS
+WEAK_ALIAS(sbrk, _sbrk)
+#endif
+
 	.data
 	.align	0
 	.globl	curbrk
@ -49,12 +53,7 @@ curbrk:
 /*
 * Change the data segment size
 */
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
 ENTRY(_sbrk)
-#else
-ENTRY(sbrk)
-#endif
 #ifdef PIC
 	/* Setup the GOT */
 	ldr	r3, Lgot
--- a/lib/libc/arch/i386/sys/brk.S
+++ b/lib/libc/arch/i386/sys/brk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: brk.S,v 1.15 2000/06/23 15:40:38 kleink Exp $	*/
+/*	$NetBSD: brk.S,v 1.16 2000/06/26 06:25:40 kleink Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -40,7 +40,7 @@

 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: brk.S,v 1.15 2000/06/23 15:40:38 kleink Exp $")
+	RCSID("$NetBSD: brk.S,v 1.16 2000/06/26 06:25:40 kleink Exp $")
 #endif /* SYSLIBC_SCCS and not lint */

 #include "SYS.h"
@ -49,17 +49,16 @@
 	.globl	_C_LABEL(__minbrk)
 	.globl	CURBRK

+#ifdef WEAK_ALIAS
+WEAK_ALIAS(brk, _brk)
+#endif
+
 	.data
 _C_LABEL(__minbrk):
 	.long	_end
 	.text

-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
 ENTRY(_brk)
-#else
-ENTRY(brk)
-#endif
 #ifdef PIC
 	movl	4(%esp),%ecx
 	PIC_PROLOGUE
--- a/lib/libc/arch/i386/sys/sbrk.S
+++ b/lib/libc/arch/i386/sys/sbrk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sbrk.S,v 1.13 2000/06/23 15:40:38 kleink Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.14 2000/06/26 06:25:40 kleink Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -40,7 +40,7 @@

 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: sbrk.S,v 1.13 2000/06/23 15:40:38 kleink Exp $")
+	RCSID("$NetBSD: sbrk.S,v 1.14 2000/06/26 06:25:40 kleink Exp $")
 #endif /* SYSLIBC_SCCS and not lint */

 #include "SYS.h"
@ -48,16 +48,15 @@
 	.globl	_end
 	.globl	CURBRK

+#ifdef WEAK_ALIAS
+WEAK_ALIAS(sbrk, _sbrk)
+#endif
+
 	.data
 CURBRK:	.long	_end
 	.text

-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
 ENTRY(_sbrk)
-#else
-ENTRY(sbrk)
-#endif
 #ifdef PIC
 	movl	4(%esp),%ecx
 	PIC_PROLOGUE
--- a/lib/libc/arch/m68k/sys/brk.S
+++ b/lib/libc/arch/m68k/sys/brk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: brk.S,v 1.11 2000/06/23 15:40:38 kleink Exp $	*/
+/*	$NetBSD: brk.S,v 1.12 2000/06/26 06:25:40 kleink Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -43,7 +43,7 @@
 #if 0
 	RCSID("from: @(#)brk.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: brk.S,v 1.11 2000/06/23 15:40:38 kleink Exp $")
+	RCSID("$NetBSD: brk.S,v 1.12 2000/06/26 06:25:40 kleink Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */

@ -51,21 +51,17 @@
 	.globl	_C_LABEL(__minbrk)
 	.globl	CURBRK

-	.data
-_C_LABEL(__minbrk):
-	.long	_C_LABEL(end)
-
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(brk, _brk)
 #endif

+	.data
+_C_LABEL(__minbrk):
+	.long	_C_LABEL(end)
+
 	.text

-#ifdef WEAK_ALIAS
 ENTRY(_brk)
-#else
-ENTRY(brk)
-#endif
 #ifdef	PIC
 #ifdef	__ELF__
 	lea	%pc@(_GLOBAL_OFFSET_TABLE_@GOTPC),%a1
--- a/lib/libc/arch/m68k/sys/sbrk.S
+++ b/lib/libc/arch/m68k/sys/sbrk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sbrk.S,v 1.11 2000/06/23 15:40:38 kleink Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.12 2000/06/26 06:25:41 kleink Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -43,27 +43,23 @@
 #if 0
 	RCSID("from: @(#)sbrk.s	5.1 (Berkeley) 5/12/90")
 #else
-	RCSID("$NetBSD: sbrk.S,v 1.11 2000/06/23 15:40:38 kleink Exp $")
+	RCSID("$NetBSD: sbrk.S,v 1.12 2000/06/26 06:25:41 kleink Exp $")
 #endif
 #endif /* LIBC_SCCS and not lint */

 	.globl	_C_LABEL(end)
 	.globl	CURBRK

-	.data
-CURBRK:	.long	_C_LABEL(end)
-
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(sbrk, _sbrk)
 #endif

+	.data
+CURBRK:	.long	_C_LABEL(end)
+
 	.text

-#ifdef WEAK_ALIAS
 ENTRY(_sbrk)
-#else
-ENTRY(sbrk)
-#endif
 #ifdef	PIC
 #ifdef	__ELF__
 	lea	%pc@(_GLOBAL_OFFSET_TABLE_@GOTPC),%a1
--- a/lib/libc/arch/mips/sys/brk.S
+++ b/lib/libc/arch/mips/sys/brk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: brk.S,v 1.10 2000/06/23 15:40:38 kleink Exp $	*/
+/*	$NetBSD: brk.S,v 1.11 2000/06/26 06:25:41 kleink Exp $	*/

 /*-
 * Copyright (c) 1991, 1993
@ -40,7 +40,7 @@

 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)brk.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: brk.S,v 1.10 2000/06/23 15:40:38 kleink Exp $")
+	ASMSTR("$NetBSD: brk.S,v 1.11 2000/06/26 06:25:41 kleink Exp $")
 #endif /* LIBC_SCCS and not lint */

 #ifdef ABICALLS
@ -60,11 +60,7 @@ _C_LABEL(__minbrk):
 	.word	_C_LABEL(_end)
 	.text

-#ifdef WEAK_ALIAS
 LEAF(_brk)
-#else
-LEAF(brk)
-#endif
 #ifdef ABICALLS
 	.set	noreorder
 	.cpload	t9
--- a/lib/libc/arch/mips/sys/sbrk.S
+++ b/lib/libc/arch/mips/sys/sbrk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sbrk.S,v 1.11 2000/06/23 15:40:38 kleink Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.12 2000/06/26 06:25:42 kleink Exp $	*/

 /*-
 * Copyright (c) 1991, 1993
@ -40,7 +40,7 @@

 #if defined(LIBC_SCCS) && !defined(lint)
 	ASMSTR("from: @(#)sbrk.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: sbrk.S,v 1.11 2000/06/23 15:40:38 kleink Exp $")
+	ASMSTR("$NetBSD: sbrk.S,v 1.12 2000/06/26 06:25:42 kleink Exp $")
 #endif /* LIBC_SCCS and not lint */

 #ifdef ABICALLS
@ -59,11 +59,7 @@ _C_LABEL(__curbrk):
 	.word	_C_LABEL(_end)
 	.text

-#ifdef WEAK_ALIAS
 LEAF(_sbrk)
-#else
-LEAF(sbrk)
-#endif
 #ifdef ABICALLS
 	.set	noreorder
 	.cpload	t9
--- a/lib/libc/arch/ns32k/sys/brk.S
+++ b/lib/libc/arch/ns32k/sys/brk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: brk.S,v 1.6 1999/01/14 22:48:21 kleink Exp $	*/
+/*	$NetBSD: brk.S,v 1.7 2000/06/26 06:25:43 kleink Exp $	*/

 /* 
 * Copyright (c) 1992 Helsinki University of Technology
@ -24,12 +24,12 @@
 #include "SYS.h"

 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: brk.S,v 1.6 1999/01/14 22:48:21 kleink Exp $")
+	RCSID("$NetBSD: brk.S,v 1.7 2000/06/26 06:25:43 kleink Exp $")
 #endif

 DATA_D(__minbrk, _C_LABEL(end))

-ENTRY(brk)
+ENTRY(_brk)
 	PIC_PROLOGUE
 	cmpd	PIC_S_ARG0,PIC_GOT(_C_LABEL(__minbrk))
 	bge	0f
--- a/lib/libc/arch/ns32k/sys/sbrk.S
+++ b/lib/libc/arch/ns32k/sys/sbrk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sbrk.S,v 1.6 1999/01/14 22:48:21 kleink Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.7 2000/06/26 06:25:43 kleink Exp $	*/

 /* 
 * Copyright (c) 1992 Helsinki University of Technology
@ -24,12 +24,12 @@
 #include "SYS.h"

 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: sbrk.S,v 1.6 1999/01/14 22:48:21 kleink Exp $")
+	RCSID("$NetBSD: sbrk.S,v 1.7 2000/06/26 06:25:43 kleink Exp $")
 #endif

 ASDATA_D(curbrk, _C_LABEL(end))

-ENTRY(sbrk)
+ENTRY(_sbrk)
 	PIC_PROLOGUE
 	addd	PIC_GOT(_ASM_LABEL(curbrk)),PIC_S_ARG0
 	PIC_EPILOGUE
--- a/lib/libc/arch/powerpc/sys/brk.S
+++ b/lib/libc/arch/powerpc/sys/brk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: brk.S,v 1.8 2000/06/23 15:40:38 kleink Exp $	*/
+/*	$NetBSD: brk.S,v 1.9 2000/06/26 06:25:43 kleink Exp $	*/

 #include "SYS.h"

@ -16,11 +16,7 @@ _C_LABEL(__minbrk):

 	.text

-#ifdef WEAK_ALIAS
 ENTRY(_brk)
-#else
-ENTRY(brk)
-#endif
 #ifdef PIC
 	mflr	10
 	bl	_GLOBAL_OFFSET_TABLE_@local-4
--- a/lib/libc/arch/powerpc/sys/sbrk.S
+++ b/lib/libc/arch/powerpc/sys/sbrk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sbrk.S,v 1.7 2000/06/23 15:40:38 kleink Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.8 2000/06/26 06:25:44 kleink Exp $	*/

 #include "SYS.h"

@ -14,11 +14,7 @@ _C_LABEL(__curbrk):
 	.long	_C_LABEL(_end)
 	.text

-#ifdef WEAK_ALIAS
 ENTRY(_sbrk)
-#else
-ENTRY(sbrk)
-#endif
 #ifdef PIC
 	mflr	10
 	bl	_GLOBAL_OFFSET_TABLE_@local-4
--- a/lib/libc/arch/sh3/sys/brk.S
+++ b/lib/libc/arch/sh3/sys/brk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: brk.S,v 1.3 2000/06/23 15:40:39 kleink Exp $	*/
+/*	$NetBSD: brk.S,v 1.4 2000/06/26 06:25:44 kleink Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -40,7 +40,7 @@

 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: brk.S,v 1.3 2000/06/23 15:40:39 kleink Exp $")
+	RCSID("$NetBSD: brk.S,v 1.4 2000/06/26 06:25:44 kleink Exp $")
 #endif /* SYSLIBC_SCCS and not lint */

 #include "SYS.h"
@ -58,11 +58,7 @@ WEAK_ALIAS(_brk, __brk)
 minbrk:	.long	_end
 	.text

-#ifdef WEAK_ALIAS
 ENTRY(_brk)
-#else
-ENTRY(brk)
-#endif
 	mov.l	Lminbrk, r0
 	mov.l	@r0, r0
 	cmp/hs	r4, r0
--- a/lib/libc/arch/sh3/sys/sbrk.S
+++ b/lib/libc/arch/sh3/sys/sbrk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sbrk.S,v 1.3 2000/06/23 15:40:39 kleink Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.4 2000/06/26 06:25:44 kleink Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -40,7 +40,7 @@

 #include <machine/asm.h>
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-	RCSID("$NetBSD: sbrk.S,v 1.3 2000/06/23 15:40:39 kleink Exp $")
+	RCSID("$NetBSD: sbrk.S,v 1.4 2000/06/26 06:25:44 kleink Exp $")
 #endif /* SYSLIBC_SCCS and not lint */

 #include "SYS.h"
@ -56,11 +56,7 @@ WEAK_ALIAS(sbrk, _sbrk)
 curbrk:	.long	_end
 	.text

-#ifdef WEAK_ALIAS
 ENTRY(_sbrk)
-#else
-ENTRY(sbrk)
-#endif
 	mov	r4, r2
 	mov.l	Lcurbrk, r0
 	mov.l	@r0, r0	
--- a/lib/libc/arch/sparc/sys/brk.S
+++ b/lib/libc/arch/sparc/sys/brk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: brk.S,v 1.8 2000/06/23 15:40:39 kleink Exp $	*/
+/*	$NetBSD: brk.S,v 1.9 2000/06/26 06:25:45 kleink Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -44,7 +44,7 @@
 #if 0
 	.asciz "@(#)brk.s	8.1 (Berkeley) 6/4/93"
 #else
-	RCSID("$NetBSD: brk.S,v 1.8 2000/06/23 15:40:39 kleink Exp $")
+	RCSID("$NetBSD: brk.S,v 1.9 2000/06/26 06:25:45 kleink Exp $")
 #endif
 #endif /* SYSLIBC_SCCS and not lint */

@ -63,11 +63,7 @@ _C_LABEL(__minbrk):
 	.long	_end			! lower brk limit; also for gmon code
 	.text

-#ifdef WEAK_ALIAS
 ENTRY(_brk)
-#else
-ENTRY(brk)
-#endif
 #ifdef PIC
 	PIC_PROLOGUE(%o5,%o4)
 	ld	[%o5 + _C_LABEL(__minbrk)], %o4
--- a/lib/libc/arch/sparc/sys/sbrk.S
+++ b/lib/libc/arch/sparc/sys/sbrk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sbrk.S,v 1.7 2000/06/23 15:40:39 kleink Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.8 2000/06/26 06:25:45 kleink Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -44,7 +44,7 @@
 #if 0
 	.asciz "@(#)sbrk.s	8.1 (Berkeley) 6/4/93"
 #else
-	RCSID("$NetBSD: sbrk.S,v 1.7 2000/06/23 15:40:39 kleink Exp $")
+	RCSID("$NetBSD: sbrk.S,v 1.8 2000/06/26 06:25:45 kleink Exp $")
 #endif
 #endif /* SYSLIBC_SCCS and not lint */

@ -61,11 +61,7 @@ WEAK_ALIAS(sbrk, _sbrk)
 CURBRK:	.long	_end
 	.text

-#ifdef WEAK_ALIAS
 ENTRY(_sbrk)
-#else
-ENTRY(sbrk)
-#endif
 #ifdef PIC
 	PIC_PROLOGUE(%o5,%o4)
 	ld	[%o5 + CURBRK], %o2
--- a/lib/libc/arch/sparc64/sys/brk.S
+++ b/lib/libc/arch/sparc64/sys/brk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: brk.S,v 1.4 2000/06/23 15:40:39 kleink Exp $	*/
+/*	$NetBSD: brk.S,v 1.5 2000/06/26 06:25:46 kleink Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -44,7 +44,7 @@
 #if 0
 	.asciz "@(#)brk.s	8.1 (Berkeley) 6/4/93"
 #else
-	RCSID("$NetBSD: brk.S,v 1.4 2000/06/23 15:40:39 kleink Exp $")
+	RCSID("$NetBSD: brk.S,v 1.5 2000/06/26 06:25:46 kleink Exp $")
 #endif
 #endif /* SYSLIBC_SCCS and not lint */

@ -63,11 +63,7 @@ _C_LABEL(__minbrk):
 	.long	_C_LABEL(_end)		! lower brk limit; also for gmon code
 	.text

-#ifdef WEAK_ALIAS
 ENTRY(_brk)
-#else
-ENTRY(brk)
-#endif
 #ifdef PIC
 	PIC_PROLOGUE(%o5,%o4)
 	ld	[%o5 + _C_LABEL(__minbrk)], %o4
--- a/lib/libc/arch/sparc64/sys/sbrk.S
+++ b/lib/libc/arch/sparc64/sys/sbrk.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sbrk.S,v 1.4 2000/06/23 15:40:39 kleink Exp $	*/
+/*	$NetBSD: sbrk.S,v 1.5 2000/06/26 06:25:46 kleink Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -44,7 +44,7 @@
 #if 0
 	.asciz "@(#)sbrk.s	8.1 (Berkeley) 6/4/93"
 #else
-	RCSID("$NetBSD: sbrk.S,v 1.4 2000/06/23 15:40:39 kleink Exp $")
+	RCSID("$NetBSD: sbrk.S,v 1.5 2000/06/26 06:25:46 kleink Exp $")
 #endif
 #endif /* SYSLIBC_SCCS and not lint */

@ -62,11 +62,7 @@ _C_LABEL(__curbrk):
 	.long	_C_LABEL(_end)
 	.text

-#ifdef WEAK_ALIAS
 ENTRY(_sbrk)
-#else
-ENTRY(sbrk)
-#endif
 #ifdef PIC
 	PIC_PROLOGUE(%o5,%o4)
 	ld	[%o5 + _C_LABEL(__curbrk)], %o2
--- a/lib/libc/arch/vax/sys/brk.S
+++ b/lib/libc/arch/vax/sys/brk.S
@ -33,7 +33,7 @@

 #if defined(SYSLIBC_SCCS) && !defined(lint)
 	/* .asciz "@(#)brk.s	8.1 (Berkeley) 6/4/93" */
-	.asciz "$NetBSD: brk.S,v 1.5 2000/06/23 15:40:39 kleink Exp $"
+	.asciz "$NetBSD: brk.S,v 1.6 2000/06/26 06:25:47 kleink Exp $"
 #endif /* SYSLIBC_SCCS and not lint */

 #include "SYS.h"
@ -43,10 +43,9 @@

 #ifdef WEAK_ALIAS
 WEAK_ALIAS(brk, _brk)
-ENTRY(_brk, 0)
-#else
-ENTRY(brk, 0)
 #endif
+
+ENTRY(_brk, 0)
 	cmpl	4(ap),___minbrk
 	bgeq	ok
 	movl	___minbrk,4(ap)
--- a/lib/libc/arch/vax/sys/sbrk.S
+++ b/lib/libc/arch/vax/sys/sbrk.S
@ -33,7 +33,7 @@

 #if defined(SYSLIBC_SCCS) && !defined(lint)
 	/* .asciz "@(#)sbrk.s	8.1 (Berkeley) 6/4/93" */
-	.asciz "$NetBSD: sbrk.S,v 1.4 2000/06/23 15:40:39 kleink Exp $"
+	.asciz "$NetBSD: sbrk.S,v 1.5 2000/06/26 06:25:47 kleink Exp $"
 #endif /* SYSLIBC_SCCS and not lint */

 #include "SYS.h"
@ -53,11 +53,7 @@ ___minbrk:
 curbrk:	.long	_end
 	.text

-#ifdef WEAK_ALIAS
 ENTRY(_sbrk, 0)
-#else
-ENTRY(sbrk, 0)
-#endif
 	addl3	curbrk,4(ap),-(sp)
 	pushl	$1
 	movl	ap,r3