[src/netbsd-6]: src/lib/libc/arch/hppa/sys Pull up following revision(s) (req...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a1bb04f37a6f
branches:  netbsd-6
changeset: 773933:a1bb04f37a6f
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Mar 17 17:50:44 2012 +0000

description:
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.

diffstat:

 lib/libc/arch/hppa/sys/brk.S  |  8 ++++----
 lib/libc/arch/hppa/sys/sbrk.S |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (63 lines):

diff -r 382235ba4948 -r a1bb04f37a6f lib/libc/arch/hppa/sys/brk.S
--- a/lib/libc/arch/hppa/sys/brk.S      Sat Mar 17 17:49:55 2012 +0000
+++ b/lib/libc/arch/hppa/sys/brk.S      Sat Mar 17 17:50:44 2012 +0000
@@ -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
diff -r 382235ba4948 -r a1bb04f37a6f lib/libc/arch/hppa/sys/sbrk.S
--- a/lib/libc/arch/hppa/sys/sbrk.S     Sat Mar 17 17:49:55 2012 +0000
+++ b/lib/libc/arch/hppa/sys/sbrk.S     Sat Mar 17 17:50:44 2012 +0000
@@ -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