From owner-svn-src-all@FreeBSD.ORG  Fri Jan  8 23:59:04 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A32701065670;
	Fri,  8 Jan 2010 23:59:04 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 923B58FC21;
	Fri,  8 Jan 2010 23:59:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o08Nx4jS031375;
	Fri, 8 Jan 2010 23:59:04 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o08Nx4FC031372;
	Fri, 8 Jan 2010 23:59:04 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201001082359.o08Nx4FC031372@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 8 Jan 2010 23:59:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201858 - in head/lib/libc/mips: . sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jan 2010 23:59:04 -0000

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: