diff options
| author | drochner <drochner@NetBSD.org> | 2010-03-23 20:28:58 +0000 |
|---|---|---|
| committer | drochner <drochner@NetBSD.org> | 2010-03-23 20:28:58 +0000 |
| commit | ebfe3c0a28cceab3b7f07184c8fa2ef99e68a84b (patch) | |
| tree | e009313d34fb551d54650efb4e59267dfe104a35 /lib | |
| parent | d6bdba5871bf5de38786932781f9b28b35b6b1a3 (diff) | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/gen/devname.c | 8 | ||||
| -rw-r--r-- | lib/libc/gen/getpwent.c | 10 | ||||
| -rw-r--r-- | lib/libc/gen/pwcache.c | 5 | ||||
| -rw-r--r-- | lib/libc/gen/utime.c | 8 | ||||
| -rw-r--r-- | lib/libc/gen/wait3.c | 8 | ||||
| -rw-r--r-- | lib/libc/rpc/pmap_rmt.c | 5 | ||||
| -rw-r--r-- | lib/libc/rpc/rpcb_clnt.c | 6 | ||||
| -rw-r--r-- | lib/libc/time/localtime.c | 6 |
8 files changed, 16 insertions, 40 deletions
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c index 6992ba7c471..e11d11f06fa 100644 --- a/lib/libc/gen/devname.c +++ b/lib/libc/gen/devname.c @@ -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 @@ __RCSID("$NetBSD: devname.c,v 1.20 2009/04/19 10:19:26 mrg Exp $"); #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 */ diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c index 551d9a8566e..c49f5e2de94 100644 --- a/lib/libc/gen/getpwent.c +++ b/lib/libc/gen/getpwent.c @@ -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 @@ __RCSID("$NetBSD: getpwent.c,v 1.76 2009/01/11 02:46:27 christos Exp $"); #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 diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c index e8df922b0a7..2caf96a515a 100644 --- a/lib/libc/gen/pwcache.c +++ b/lib/libc/gen/pwcache.c @@ -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 @@ __RCSID("$NetBSD: pwcache.c,v 1.30 2008/04/28 20:22:59 martin Exp $"); #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 diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c index 2654c49e44f..46534b87af4 100644 --- a/lib/libc/gen/utime.c +++ b/lib/libc/gen/utime.c @@ -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 @@ __RCSID("$NetBSD: utime.c,v 1.12 2003/08/07 16:42:59 agc Exp $"); #include <stddef.h> #include <utime.h> -#ifdef __weak_alias -__weak_alias(utime,_utime) -#endif - int utime(path, times) const char *path; diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c index df250d95bf3..3152552aa52 100644 --- a/lib/libc/gen/wait3.c +++ b/lib/libc/gen/wait3.c @@ -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 @@ __RCSID("$NetBSD: wait3.c,v 1.8 2003/08/07 16:43:00 agc Exp $"); #include <sys/wait.h> #include <sys/resource.h> -#ifdef __weak_alias -__weak_alias(wait3,_wait3) -#endif - pid_t wait3(istat, options, rup) int *istat; diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c index 8d2148e61ff..f7e43ccf098 100644 --- a/lib/libc/rpc/pmap_rmt.c +++ b/lib/libc/rpc/pmap_rmt.c @@ -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 @@ __RCSID("$NetBSD: pmap_rmt.c,v 1.29 2000/07/06 03:10:34 christos Exp $"); #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 diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c index 15270b72616..82d3b763f8f 100644 --- a/lib/libc/rpc/rpcb_clnt.c +++ b/lib/libc/rpc/rpcb_clnt.c @@ -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 @@ __RCSID("$NetBSD: rpcb_clnt.c,v 1.24 2008/07/25 14:05:25 christos Exp $"); __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 diff --git a/lib/libc/time/localtime.c b/lib/libc/time/localtime.c index 0a38433ba06..ff74e33c266 100644 --- a/lib/libc/time/localtime.c +++ b/lib/libc/time/localtime.c @@ -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 @@ __RCSID("$NetBSD: localtime.c,v 1.47 2010/02/17 17:25:55 christos Exp $"); #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 */ |
