Module Name: src
Committed By: drochner
Date: Tue Mar 23 20:28:59 UTC 2010
Modified Files:
src/lib/libc/gen: devname.c getpwent.c pwcache.c utime.c wait3.c
src/lib/libc/rpc: pmap_rmt.c rpcb_clnt.c
src/lib/libc/time: localtime.c
Log Message:
remove some stray __weak_aliases, where the target functions were
__RENAMEd due to the time_t/dev_t type changes, which caused bogus
references to compat functions
now a libc built with BUILDCOLD is usable
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/gen/devname.c
cvs rdiff -u -r1.76 -r1.77 src/lib/libc/gen/getpwent.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libc/gen/pwcache.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/gen/utime.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/gen/wait3.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/rpc/pmap_rmt.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/rpc/rpcb_clnt.c
cvs rdiff -u -r1.47 -r1.48 src/lib/libc/time/localtime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/devname.c
diff -u src/lib/libc/gen/devname.c:1.20 src/lib/libc/gen/devname.c:1.21
--- src/lib/libc/gen/devname.c:1.20 Sun Apr 19 10:19:26 2009
+++ src/lib/libc/gen/devname.c Tue Mar 23 20:28:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: devname.c,v 1.20 2009/04/19 10:19:26 mrg Exp $ */
+/* $NetBSD: devname.c,v 1.21 2010/03/23 20:28:59 drochner Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#if 0
static char sccsid[] = "@(#)devname.c 8.2 (Berkeley) 4/29/95";
#else
-__RCSID("$NetBSD: devname.c,v 1.20 2009/04/19 10:19:26 mrg Exp $");
+__RCSID("$NetBSD: devname.c,v 1.21 2010/03/23 20:28:59 drochner Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -84,10 +84,6 @@
#include <stdlib.h>
#include <err.h>
-#ifdef __weak_alias
-__weak_alias(devname,_devname)
-#endif
-
#define DEV_SZ 317 /* show be prime for best results */
#define VALID 1 /* entry and devname are valid */
#define INVALID 2 /* entry valid, devname NOT valid */
Index: src/lib/libc/gen/getpwent.c
diff -u src/lib/libc/gen/getpwent.c:1.76 src/lib/libc/gen/getpwent.c:1.77
--- src/lib/libc/gen/getpwent.c:1.76 Sun Jan 11 02:46:27 2009
+++ src/lib/libc/gen/getpwent.c Tue Mar 23 20:28:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: getpwent.c,v 1.76 2009/01/11 02:46:27 christos Exp $ */
+/* $NetBSD: getpwent.c,v 1.77 2010/03/23 20:28:59 drochner Exp $ */
/*-
* Copyright (c) 1997-2000, 2004-2005 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
#if 0
static char sccsid[] = "@(#)getpwent.c 8.2 (Berkeley) 4/27/95";
#else
-__RCSID("$NetBSD: getpwent.c,v 1.76 2009/01/11 02:46:27 christos Exp $");
+__RCSID("$NetBSD: getpwent.c,v 1.77 2010/03/23 20:28:59 drochner Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -129,12 +129,6 @@
#ifdef __weak_alias
__weak_alias(endpwent,_endpwent)
-__weak_alias(getpwent,_getpwent)
-__weak_alias(getpwent_r,_getpwent_r)
-__weak_alias(getpwnam,_getpwnam)
-__weak_alias(getpwnam_r,_getpwnam_r)
-__weak_alias(getpwuid,_getpwuid)
-__weak_alias(getpwuid_r,_getpwuid_r)
__weak_alias(setpassent,_setpassent)
__weak_alias(setpwent,_setpwent)
#endif
Index: src/lib/libc/gen/pwcache.c
diff -u src/lib/libc/gen/pwcache.c:1.30 src/lib/libc/gen/pwcache.c:1.31
--- src/lib/libc/gen/pwcache.c:1.30 Mon Apr 28 20:22:59 2008
+++ src/lib/libc/gen/pwcache.c Tue Mar 23 20:28:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pwcache.c,v 1.30 2008/04/28 20:22:59 martin Exp $ */
+/* $NetBSD: pwcache.c,v 1.31 2010/03/23 20:28:59 drochner Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -74,7 +74,7 @@
#if 0
static char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: pwcache.c,v 1.30 2008/04/28 20:22:59 martin Exp $");
+__RCSID("$NetBSD: pwcache.c,v 1.31 2010/03/23 20:28:59 drochner Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -100,7 +100,6 @@
#ifdef __weak_alias
__weak_alias(user_from_uid,_user_from_uid)
__weak_alias(group_from_gid,_group_from_gid)
-__weak_alias(pwcache_userdb,_pwcache_userdb)
__weak_alias(pwcache_groupdb,_pwcache_groupdb)
#endif
Index: src/lib/libc/gen/utime.c
diff -u src/lib/libc/gen/utime.c:1.12 src/lib/libc/gen/utime.c:1.13
--- src/lib/libc/gen/utime.c:1.12 Thu Aug 7 16:42:59 2003
+++ src/lib/libc/gen/utime.c Tue Mar 23 20:28:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: utime.c,v 1.12 2003/08/07 16:42:59 agc Exp $ */
+/* $NetBSD: utime.c,v 1.13 2010/03/23 20:28:59 drochner Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)utime.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: utime.c,v 1.12 2003/08/07 16:42:59 agc Exp $");
+__RCSID("$NetBSD: utime.c,v 1.13 2010/03/23 20:28:59 drochner Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -46,10 +46,6 @@
#include <stddef.h>
#include <utime.h>
-#ifdef __weak_alias
-__weak_alias(utime,_utime)
-#endif
-
int
utime(path, times)
const char *path;
Index: src/lib/libc/gen/wait3.c
diff -u src/lib/libc/gen/wait3.c:1.8 src/lib/libc/gen/wait3.c:1.9
--- src/lib/libc/gen/wait3.c:1.8 Thu Aug 7 16:43:00 2003
+++ src/lib/libc/gen/wait3.c Tue Mar 23 20:28:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wait3.c,v 1.8 2003/08/07 16:43:00 agc Exp $ */
+/* $NetBSD: wait3.c,v 1.9 2010/03/23 20:28:59 drochner Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)wait3.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: wait3.c,v 1.8 2003/08/07 16:43:00 agc Exp $");
+__RCSID("$NetBSD: wait3.c,v 1.9 2010/03/23 20:28:59 drochner Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -44,10 +44,6 @@
#include <sys/wait.h>
#include <sys/resource.h>
-#ifdef __weak_alias
-__weak_alias(wait3,_wait3)
-#endif
-
pid_t
wait3(istat, options, rup)
int *istat;
Index: src/lib/libc/rpc/pmap_rmt.c
diff -u src/lib/libc/rpc/pmap_rmt.c:1.29 src/lib/libc/rpc/pmap_rmt.c:1.30
--- src/lib/libc/rpc/pmap_rmt.c:1.29 Thu Jul 6 03:10:34 2000
+++ src/lib/libc/rpc/pmap_rmt.c Tue Mar 23 20:28:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_rmt.c,v 1.29 2000/07/06 03:10:34 christos Exp $ */
+/* $NetBSD: pmap_rmt.c,v 1.30 2010/03/23 20:28:59 drochner Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)pmap_rmt.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: pmap_rmt.c,v 1.29 2000/07/06 03:10:34 christos Exp $");
+__RCSID("$NetBSD: pmap_rmt.c,v 1.30 2010/03/23 20:28:59 drochner Exp $");
#endif
#endif
@@ -71,7 +71,6 @@
#include <rpc/pmap_rmt.h>
#ifdef __weak_alias
-__weak_alias(pmap_rmtcall,_pmap_rmtcall)
__weak_alias(xdr_rmtcall_args,_xdr_rmtcall_args)
__weak_alias(xdr_rmtcallres,_xdr_rmtcallres)
#endif
Index: src/lib/libc/rpc/rpcb_clnt.c
diff -u src/lib/libc/rpc/rpcb_clnt.c:1.24 src/lib/libc/rpc/rpcb_clnt.c:1.25
--- src/lib/libc/rpc/rpcb_clnt.c:1.24 Fri Jul 25 14:05:25 2008
+++ src/lib/libc/rpc/rpcb_clnt.c Tue Mar 23 20:28:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcb_clnt.c,v 1.24 2008/07/25 14:05:25 christos Exp $ */
+/* $NetBSD: rpcb_clnt.c,v 1.25 2010/03/23 20:28:58 drochner Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro";
#else
-__RCSID("$NetBSD: rpcb_clnt.c,v 1.24 2008/07/25 14:05:25 christos Exp $");
+__RCSID("$NetBSD: rpcb_clnt.c,v 1.25 2010/03/23 20:28:58 drochner Exp $");
#endif
#endif
@@ -79,8 +79,6 @@
__weak_alias(rpcb_set,_rpcb_set)
__weak_alias(rpcb_unset,_rpcb_unset)
__weak_alias(rpcb_getmaps,_rpcb_getmaps)
-__weak_alias(rpcb_rmtcall,_rpcb_rmtcall)
-__weak_alias(rpcb_gettime,_rpcb_gettime)
__weak_alias(rpcb_taddr2uaddr,_rpcb_taddr2uaddr)
__weak_alias(rpcb_uaddr2taddr,_rpcb_uaddr2taddr)
#endif
Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.47 src/lib/libc/time/localtime.c:1.48
--- src/lib/libc/time/localtime.c:1.47 Wed Feb 17 17:25:55 2010
+++ src/lib/libc/time/localtime.c Tue Mar 23 20:28:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: localtime.c,v 1.47 2010/02/17 17:25:55 christos Exp $ */
+/* $NetBSD: localtime.c,v 1.48 2010/03/23 20:28:58 drochner Exp $ */
/*
** This file is in the public domain, so clarified as of
@@ -10,7 +10,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.9";
#else
-__RCSID("$NetBSD: localtime.c,v 1.47 2010/02/17 17:25:55 christos Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.48 2010/03/23 20:28:58 drochner Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -30,8 +30,6 @@
#if defined(__weak_alias)
__weak_alias(daylight,_daylight)
__weak_alias(tzname,_tzname)
-__weak_alias(tzset,_tzset)
-__weak_alias(tzsetwall,_tzsetwall)
#endif
#include "float.h" /* for FLT_MAX and DBL_MAX */
