1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00

Merge r197800 from projects/mips to head by hand:

r197800 | gonzo | 2009-10-06 00:35:52 -0600 (Tue, 06 Oct 2009) | 3 lines
- curbrk variable for sbrk and brk should be the same
- Add correct variable names to Symbol.map
This commit is contained in:
Warner Losh 2010-01-08 23:59:04 +00:00
parent 9cd8780a69
commit 87e925fb53
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=201858
2 changed files with 4 additions and 7 deletions

View File

@ -56,8 +56,8 @@ FBSDprivate_1.0 {
__siglongjmp; __siglongjmp;
__sys_vfork; __sys_vfork;
_vfork; _vfork;
end; /* XXX - Should this be _end (see sys/brk.S)? */ _end;
curbrk; __curbrk;
minbrk; minbrk;
_brk; _brk;
_sbrk; _sbrk;

View File

@ -42,15 +42,12 @@ __FBSDID("$FreeBSD$");
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
.globl _C_LABEL(minbrk) .globl _C_LABEL(minbrk)
.globl _C_LABEL(curbrk) .globl _C_LABEL(__curbrk)
.globl _C_LABEL(_end) .globl _C_LABEL(_end)
.data .data
_C_LABEL(minbrk): _C_LABEL(minbrk):
.word _C_LABEL(_end) .word _C_LABEL(_end)
_C_LABEL(curbrk):
.word _C_LABEL(_end)
.text
LEAF(__sys_brk) LEAF(__sys_brk)
WEAK_ALIAS(brk, __sys_brk) WEAK_ALIAS(brk, __sys_brk)
@ -67,7 +64,7 @@ LEAF(__sys_brk)
li v0, SYS_break li v0, SYS_break
syscall syscall
bne a3, zero, 2f bne a3, zero, 2f
sw a0, _C_LABEL(curbrk) sw a0, _C_LABEL(__curbrk)
move v0, zero move v0, zero
j ra j ra
2: 2: