Module Name: src
Committed By: matt
Date: Thu Jul 18 12:27:01 UTC 2013
Modified Files:
src/lib/libc/arch/vax/sys: brk.S sbrk.S
Log Message:
Make __curbrk & __minbrk hidden.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/vax/sys/brk.S
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/vax/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/vax/sys/brk.S
diff -u src/lib/libc/arch/vax/sys/brk.S:1.13 src/lib/libc/arch/vax/sys/brk.S:1.14
--- src/lib/libc/arch/vax/sys/brk.S:1.13 Tue Jan 25 02:38:15 2011
+++ src/lib/libc/arch/vax/sys/brk.S Thu Jul 18 12:27:01 2013
@@ -31,23 +31,26 @@
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)brk.s 8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: brk.S,v 1.13 2011/01/25 02:38:15 matt Exp $")
+RCSID("$NetBSD: brk.S,v 1.14 2013/07/18 12:27:01 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
- .globl CURBRK
+ .globl _C_LABEL(__curbrk)
.globl _C_LABEL(__minbrk)
+ .hidden _C_LABEL(__curbrk)
+ .hidden _C_LABEL(__minbrk)
#ifdef WEAK_ALIAS
WEAK_ALIAS(brk, _brk)
#endif
ENTRY(_brk, 0)
- cmpl _C_LABEL(__minbrk),4(%ap) # gtr > _end
+ moval _C_LABEL(__minbrk),%r5 # gtr > _end
+ cmpl (%r5),4(%ap) # gtr > _end
blequ 1f # is fine
- movl _C_LABEL(__minbrk),4(%ap) # shrink back to _end
+ movl (%r5),4(%ap) # shrink back to _end
1: chmk $ SYS_break # do it
jcs err
- movl 4(%ap),CURBRK
+ movl 4(%ap),_C_LABEL(__curbrk)
clrl %r0
ret
err:
Index: src/lib/libc/arch/vax/sys/sbrk.S
diff -u src/lib/libc/arch/vax/sys/sbrk.S:1.11 src/lib/libc/arch/vax/sys/sbrk.S:1.12
--- src/lib/libc/arch/vax/sys/sbrk.S:1.11 Tue Jan 25 02:38:15 2011
+++ src/lib/libc/arch/vax/sys/sbrk.S Thu Jul 18 12:27:01 2013
@@ -31,12 +31,14 @@
#if defined(SYSLIBC_SCCS) && !defined(lint)
/* .asciz "@(#)sbrk.s 8.1 (Berkeley) 6/4/93" */
-RCSID("$NetBSD: sbrk.S,v 1.11 2011/01/25 02:38:15 matt Exp $")
+RCSID("$NetBSD: sbrk.S,v 1.12 2013/07/18 12:27:01 matt Exp $")
#endif /* SYSLIBC_SCCS and not lint */
.globl _end
.globl _C_LABEL(__minbrk)
- .globl CURBRK
+ .globl _C_LABEL(__curbrk)
+ .hidden _C_LABEL(__minbrk)
+ .hidden _C_LABEL(__curbrk)
#ifdef WEAK_ALIAS
WEAK_ALIAS(sbrk, _sbrk)
@@ -45,19 +47,20 @@ WEAK_ALIAS(sbrk, _sbrk)
.data
_C_LABEL(__minbrk):
.long _end
-CURBRK:
+_C_LABEL(__curbrk):
.long _end
.text
ENTRY(_sbrk, 0)
- addl3 CURBRK,4(%ap),-(%sp)
+ moval _C_LABEL(__curbrk),%r5
+ addl3 (%r5),4(%ap),-(%sp)
pushl $1
movl %ap,%r3
movl %sp,%ap
chmk $ SYS_break
jcs err
- movl CURBRK,%r0
- addl2 4(%r3),CURBRK
+ movl (%r5),%r0
+ addl2 4(%r3),(%r5)
ret
err:
jmp CERROR+2
