From owner-svn-src-all@FreeBSD.ORG  Sat Jan 16 17:05:27 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 CC6CB1065692;
	Sat, 16 Jan 2010 17:05:27 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BBD4E8FC0A;
	Sat, 16 Jan 2010 17:05:27 +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 o0GH5R7c056242;
	Sat, 16 Jan 2010 17:05:27 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0GH5ReU056240;
	Sat, 16 Jan 2010 17:05:27 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001161705.o0GH5ReU056240@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 16 Jan 2010 17:05:27 +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: r202447 - head/lib/libc/gen
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: Sat, 16 Jan 2010 17:05:27 -0000

Author: ed
Date: Sat Jan 16 17:05:27 2010
New Revision: 202447
URL: http://svn.freebsd.org/changeset/base/202447

Log:
  Unexpose the old uname(3) function.
  
  Nowadays uname(3) is an inline function around __xuname(3). Prevent
  linkage of new binaries against this compatibility function, similar to
  what I did with ttyslot(3).

Modified:
  head/lib/libc/gen/Symbol.map
  head/lib/libc/gen/uname.c

Modified: head/lib/libc/gen/Symbol.map
==============================================================================
--- head/lib/libc/gen/Symbol.map	Sat Jan 16 15:00:35 2010	(r202446)
+++ head/lib/libc/gen/Symbol.map	Sat Jan 16 17:05:27 2010	(r202447)
@@ -296,7 +296,6 @@ FBSD_1.0 {
 	tcflow;
 	ualarm;
 	ulimit;
-	uname;
 	unvis;
 	strunvis;
 	strunvisx;

Modified: head/lib/libc/gen/uname.c
==============================================================================
--- head/lib/libc/gen/uname.c	Sat Jan 16 15:00:35 2010	(r202446)
+++ head/lib/libc/gen/uname.c	Sat Jan 16 17:05:27 2010	(r202447)
@@ -33,15 +33,15 @@ static char sccsid[] = "From: @(#)uname.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#define uname wrapped_uname
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/utsname.h>
 #include <errno.h>
-#undef uname
 
 int
-uname(struct utsname *name)
+__uname(struct utsname *name)
 {
 	return __xuname(32, name);
 }
+
+__sym_compat(uname, __uname, FBSD_1.0);