[src/trunk]: src/lib/libc Don't __weak_alias non-existent symbols. Apparentl...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/527fe3dd3110
branches:  trunk
changeset: 759622:527fe3dd3110
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Dec 13 23:10:12 2010 +0000

description:
Don't __weak_alias non-existent symbols.  Apparently the alpha
compiler doesn't like it.

diffstat:

 lib/libc/gen/sysctlbyname.c     |  12 ++++++------
 lib/libc/gen/sysctlgetmibinfo.c |  12 ++++++------
 lib/libc/gen/sysctlnametomib.c  |  12 ++++++------
 lib/libc/net/if_indextoname.c   |   6 ++++--
 4 files changed, 22 insertions(+), 20 deletions(-)

diffs (139 lines):

diff -r 07addf7f1bef -r 527fe3dd3110 lib/libc/gen/sysctlbyname.c
--- a/lib/libc/gen/sysctlbyname.c       Mon Dec 13 21:48:01 2010 +0000
+++ b/lib/libc/gen/sysctlbyname.c       Mon Dec 13 23:10:12 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysctlbyname.c,v 1.6 2010/12/13 14:17:11 pooka Exp $ */
+/*     $NetBSD: sysctlbyname.c,v 1.7 2010/12/13 23:10:13 pooka Exp $ */
 
 /*-
  * Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysctlbyname.c,v 1.6 2010/12/13 14:17:11 pooka Exp $");
+__RCSID("$NetBSD: sysctlbyname.c,v 1.7 2010/12/13 23:10:13 pooka Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef RUMP_ACTION
@@ -40,13 +40,13 @@
 #include <sys/param.h>
 #include <sys/sysctl.h>
 
+#ifdef RUMP_ACTION
+#include <rump/rump_syscalls.h>
+#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
+#else
 #ifdef __weak_alias
 __weak_alias(sysctlbyname,_sysctlbyname)
 #endif
-
-#ifdef RUMP_ACTION
-#include <rump/rump_syscalls.h>
-#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
 #endif
 
 /*
diff -r 07addf7f1bef -r 527fe3dd3110 lib/libc/gen/sysctlgetmibinfo.c
--- a/lib/libc/gen/sysctlgetmibinfo.c   Mon Dec 13 21:48:01 2010 +0000
+++ b/lib/libc/gen/sysctlgetmibinfo.c   Mon Dec 13 23:10:12 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysctlgetmibinfo.c,v 1.8 2010/11/05 15:55:23 pooka Exp $ */
+/*     $NetBSD: sysctlgetmibinfo.c,v 1.9 2010/12/13 23:10:13 pooka Exp $ */
 
 /*-
  * Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysctlgetmibinfo.c,v 1.8 2010/11/05 15:55:23 pooka Exp $");
+__RCSID("$NetBSD: sysctlgetmibinfo.c,v 1.9 2010/12/13 23:10:13 pooka Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef RUMP_ACTION
@@ -48,14 +48,14 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef RUMP_ACTION
+#include <rump/rump_syscalls.h>
+#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
+#else
 #ifdef __weak_alias
 __weak_alias(__learn_tree,___learn_tree)
 __weak_alias(sysctlgetmibinfo,_sysctlgetmibinfo)
 #endif
-
-#ifdef RUMP_ACTION
-#include <rump/rump_syscalls.h>
-#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
 #endif
 
 /*
diff -r 07addf7f1bef -r 527fe3dd3110 lib/libc/gen/sysctlnametomib.c
--- a/lib/libc/gen/sysctlnametomib.c    Mon Dec 13 21:48:01 2010 +0000
+++ b/lib/libc/gen/sysctlnametomib.c    Mon Dec 13 23:10:12 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sysctlnametomib.c,v 1.5 2010/12/13 21:07:55 pooka Exp $ */
+/*     $NetBSD: sysctlnametomib.c,v 1.6 2010/12/13 23:10:13 pooka Exp $ */
 
 /*-
  * Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sysctlnametomib.c,v 1.5 2010/12/13 21:07:55 pooka Exp $");
+__RCSID("$NetBSD: sysctlnametomib.c,v 1.6 2010/12/13 23:10:13 pooka Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef RUMP_ACTION
@@ -40,13 +40,13 @@
 #include <sys/param.h>
 #include <sys/sysctl.h>
 
+#ifdef RUMP_ACTION
+#include <rump/rump_syscalls.h>
+#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
+#else
 #ifdef __weak_alias
 __weak_alias(sysctlnametomib,_sysctlnametomib)
 #endif
-
-#ifdef RUMP_ACTION
-#include <rump/rump_syscalls.h>
-#define sysctl(a,b,c,d,e,f) rump_sys___sysctl(a,b,c,d,e,f)
 #endif /* RUMP_ACTION */
 
 /*
diff -r 07addf7f1bef -r 527fe3dd3110 lib/libc/net/if_indextoname.c
--- a/lib/libc/net/if_indextoname.c     Mon Dec 13 21:48:01 2010 +0000
+++ b/lib/libc/net/if_indextoname.c     Mon Dec 13 23:10:12 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_indextoname.c,v 1.6 2010/12/13 21:07:54 pooka Exp $ */
+/*     $NetBSD: if_indextoname.c,v 1.7 2010/12/13 23:10:12 pooka Exp $ */
 /*     $KAME: if_indextoname.c,v 1.7 2000/11/08 03:09:30 itojun Exp $  */
 
 /*-
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: if_indextoname.c,v 1.6 2010/12/13 21:07:54 pooka Exp $");
+__RCSID("$NetBSD: if_indextoname.c,v 1.7 2010/12/13 23:10:12 pooka Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #ifndef RUMP_ACTION
@@ -43,9 +43,11 @@
 #include <string.h>
 #include <errno.h>
 
+#ifndef RUMP_ACTION
 #ifdef __weak_alias
 __weak_alias(if_indextoname,_if_indextoname)
 #endif
+#endif
 
 /*
  * From RFC 2533: