Date: Fri, 8 Jan 2010 23:59:04 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r201858 - in head/lib/libc/mips: . sys Message-ID: <201001082359.o08Nx4FC031372@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Fri Jan 8 23:59:04 2010 New Revision: 201858 URL: http://svn.freebsd.org/changeset/base/201858 Log: 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 Modified: head/lib/libc/mips/Symbol.map head/lib/libc/mips/sys/brk.S Modified: head/lib/libc/mips/Symbol.map ============================================================================== --- head/lib/libc/mips/Symbol.map Fri Jan 8 23:57:30 2010 (r201857) +++ head/lib/libc/mips/Symbol.map Fri Jan 8 23:59:04 2010 (r201858) @@ -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; Modified: head/lib/libc/mips/sys/brk.S ============================================================================== --- head/lib/libc/mips/sys/brk.S Fri Jan 8 23:57:30 2010 (r201857) +++ head/lib/libc/mips/sys/brk.S Fri Jan 8 23:59:04 2010 (r201858) @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001082359.o08Nx4FC031372>