diff options
| author | imp <imp@FreeBSD.org> | 2010-01-08 23:59:04 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-01-08 23:59:04 +0000 |
| commit | 0ec6bf46abc07cc6f1cd4b328f685d271903c9d8 (patch) | |
| tree | fd178798ca167a94f570caf01553bb312fc8de00 /lib | |
| parent | 5bd0838ff59a038135c0149516fae77be123eb31 (diff) | |
| download | FreeBSD-src-0ec6bf46abc07cc6f1cd4b328f685d271903c9d8.zip FreeBSD-src-0ec6bf46abc07cc6f1cd4b328f685d271903c9d8.tar.gz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/mips/Symbol.map | 4 | ||||
| -rw-r--r-- | lib/libc/mips/sys/brk.S | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/libc/mips/Symbol.map b/lib/libc/mips/Symbol.map index 2bbdd6d..c8664eb 100644 --- a/lib/libc/mips/Symbol.map +++ b/lib/libc/mips/Symbol.map @@ -56,8 +56,8 @@ FBSDprivate_1.0 { __siglongjmp; __sys_vfork; _vfork; - end; /* XXX - Should this be _end (see sys/brk.S)? */ - curbrk; + _end; + __curbrk; minbrk; _brk; _sbrk; diff --git a/lib/libc/mips/sys/brk.S b/lib/libc/mips/sys/brk.S index 580d7fa..aeaf791 100644 --- a/lib/libc/mips/sys/brk.S +++ b/lib/libc/mips/sys/brk.S @@ -42,15 +42,12 @@ __FBSDID("$FreeBSD$"); #endif /* LIBC_SCCS and not lint */ .globl _C_LABEL(minbrk) - .globl _C_LABEL(curbrk) + .globl _C_LABEL(__curbrk) .globl _C_LABEL(_end) .data _C_LABEL(minbrk): .word _C_LABEL(_end) -_C_LABEL(curbrk): - .word _C_LABEL(_end) - .text LEAF(__sys_brk) WEAK_ALIAS(brk, __sys_brk) @@ -67,7 +64,7 @@ LEAF(__sys_brk) li v0, SYS_break syscall bne a3, zero, 2f - sw a0, _C_LABEL(curbrk) + sw a0, _C_LABEL(__curbrk) move v0, zero j ra 2: |
