Module Name: src
Committed By: bouyer
Date: Sat Mar 17 17:50:44 UTC 2012
Modified Files:
src/lib/libc/arch/hppa/sys [netbsd-6]: brk.S sbrk.S
Log Message:
Pull up following revision(s) (requested by skrll in ticket #120):
lib/libc/arch/hppa/sys/brk.S: revision 1.5
lib/libc/arch/hppa/sys/sbrk.S: revision 1.5
Use the _end symbol rather than the end symbol. Prevents version info
problems in elflink.c for the heimdal libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/lib/libc/arch/hppa/sys/brk.S \
src/lib/libc/arch/hppa/sys/sbrk.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/hppa/sys/brk.S
diff -u src/lib/libc/arch/hppa/sys/brk.S:1.4 src/lib/libc/arch/hppa/sys/brk.S:1.4.8.1
--- src/lib/libc/arch/hppa/sys/brk.S:1.4 Tue Nov 3 05:07:25 2009
+++ src/lib/libc/arch/hppa/sys/brk.S Sat Mar 17 17:50:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: brk.S,v 1.4 2009/11/03 05:07:25 snj Exp $ */
+/* $NetBSD: brk.S,v 1.4.8.1 2012/03/17 17:50:44 bouyer Exp $ */
/* $OpenBSD: brk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */
@@ -31,11 +31,11 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: brk.S,v 1.4 2009/11/03 05:07:25 snj Exp $")
+ RCSID("$NetBSD: brk.S,v 1.4.8.1 2012/03/17 17:50:44 bouyer Exp $")
#endif /* LIBC_SCCS and not lint */
.import curbrk, data
- .import end, data
+ .global _end
#ifdef WEAK_ALIAS
WEAK_ALIAS(brk, _brk)
@@ -44,7 +44,7 @@
.data
.export __minbrk, data
__minbrk:
- .long end
+ .long _end
ENTRY(_brk,0)
#ifdef PIC
Index: src/lib/libc/arch/hppa/sys/sbrk.S
diff -u src/lib/libc/arch/hppa/sys/sbrk.S:1.4 src/lib/libc/arch/hppa/sys/sbrk.S:1.4.8.1
--- src/lib/libc/arch/hppa/sys/sbrk.S:1.4 Tue Nov 3 05:07:25 2009
+++ src/lib/libc/arch/hppa/sys/sbrk.S Sat Mar 17 17:50:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sbrk.S,v 1.4 2009/11/03 05:07:25 snj Exp $ */
+/* $NetBSD: sbrk.S,v 1.4.8.1 2012/03/17 17:50:44 bouyer Exp $ */
/* $OpenBSD: sbrk.S,v 1.7 2001/06/04 23:14:04 mickey Exp $ */
@@ -31,10 +31,10 @@
#include "SYS.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: sbrk.S,v 1.4 2009/11/03 05:07:25 snj Exp $")
+ RCSID("$NetBSD: sbrk.S,v 1.4.8.1 2012/03/17 17:50:44 bouyer Exp $")
#endif /* LIBC_SCCS and not lint */
- .import end, data
+ .global _end
#ifdef WEAK_ALIAS
WEAK_ALIAS(sbrk, _sbrk)
@@ -43,7 +43,7 @@
.data
.export curbrk, data
curbrk:
- .long end
+ .long _end
ENTRY(_sbrk,0)
#ifdef PIC
