From owner-svn-src-all@FreeBSD.ORG  Sun Dec 21 04:27:52 2008
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 E331F106564A;
	Sun, 21 Dec 2008 04:27:52 +0000 (UTC)
	(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D1C6F8FC0C;
	Sun, 21 Dec 2008 04:27:52 +0000 (UTC)
	(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBL4Rqst023304;
	Sun, 21 Dec 2008 04:27:52 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBL4Rq2F023301;
	Sun, 21 Dec 2008 04:27:52 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <200812210427.mBL4Rq2F023301@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Sun, 21 Dec 2008 04:27:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186367 - in releng/7.1/lib/libc: . i386/sys string
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: Sun, 21 Dec 2008 04:27:53 -0000

Author: peter
Date: Sun Dec 21 04:27:52 2008
New Revision: 186367
URL: http://svn.freebsd.org/changeset/base/186367

Log:
  Merge rev 185725 (184996 in head):  Use correct names in END() macros.
  
  Approved by:	re (kib)
  Reminded by:	kensmith

Modified:
  releng/7.1/lib/libc/   (props changed)
  releng/7.1/lib/libc/i386/sys/pipe.S
  releng/7.1/lib/libc/i386/sys/reboot.S
  releng/7.1/lib/libc/i386/sys/setlogin.S
  releng/7.1/lib/libc/string/ffsll.c   (props changed)
  releng/7.1/lib/libc/string/flsll.c   (props changed)

Modified: releng/7.1/lib/libc/i386/sys/pipe.S
==============================================================================
--- releng/7.1/lib/libc/i386/sys/pipe.S	Sun Dec 21 00:13:50 2008	(r186366)
+++ releng/7.1/lib/libc/i386/sys/pipe.S	Sun Dec 21 04:27:52 2008	(r186367)
@@ -44,4 +44,4 @@ SYSCALL(pipe)
 	movl	%edx,4(%ecx)
 	movl	$0,%eax
 	ret
-END(pipe)
+END(__sys_pipe)

Modified: releng/7.1/lib/libc/i386/sys/reboot.S
==============================================================================
--- releng/7.1/lib/libc/i386/sys/reboot.S	Sun Dec 21 00:13:50 2008	(r186366)
+++ releng/7.1/lib/libc/i386/sys/reboot.S	Sun Dec 21 04:27:52 2008	(r186367)
@@ -40,4 +40,4 @@ __FBSDID("$FreeBSD$");
 
 SYSCALL(reboot)
 	iret
-END(reboot)
+END(__sys_reboot)

Modified: releng/7.1/lib/libc/i386/sys/setlogin.S
==============================================================================
--- releng/7.1/lib/libc/i386/sys/setlogin.S	Sun Dec 21 00:13:50 2008	(r186366)
+++ releng/7.1/lib/libc/i386/sys/setlogin.S	Sun Dec 21 04:27:52 2008	(r186367)
@@ -52,4 +52,4 @@ SYSCALL(setlogin)
 	movl	$0,CNAME(_logname_valid)
 #endif
 	ret				/* setlogin(name) */
-END(setlogin)
+END(__sys_setlogin)