Module Name: src
Committed By: pooka
Date: Mon Dec 13 23:10:13 UTC 2010
Modified Files:
src/lib/libc/gen: sysctlbyname.c sysctlgetmibinfo.c sysctlnametomib.c
src/lib/libc/net: if_indextoname.c
Log Message:
Don't __weak_alias non-existent symbols. Apparently the alpha
compiler doesn't like it.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/gen/sysctlbyname.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/gen/sysctlgetmibinfo.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/gen/sysctlnametomib.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/net/if_indextoname.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/sysctlbyname.c
diff -u src/lib/libc/gen/sysctlbyname.c:1.6 src/lib/libc/gen/sysctlbyname.c:1.7
--- src/lib/libc/gen/sysctlbyname.c:1.6 Mon Dec 13 14:17:11 2010
+++ src/lib/libc/gen/sysctlbyname.c Mon Dec 13 23:10:13 2010
@@ -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 __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)
+#else
+#ifdef __weak_alias
+__weak_alias(sysctlbyname,_sysctlbyname)
+#endif
#endif
/*
Index: src/lib/libc/gen/sysctlgetmibinfo.c
diff -u src/lib/libc/gen/sysctlgetmibinfo.c:1.8 src/lib/libc/gen/sysctlgetmibinfo.c:1.9
--- src/lib/libc/gen/sysctlgetmibinfo.c:1.8 Fri Nov 5 15:55:23 2010
+++ src/lib/libc/gen/sysctlgetmibinfo.c Mon Dec 13 23:10:13 2010
@@ -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
/*
Index: src/lib/libc/gen/sysctlnametomib.c
diff -u src/lib/libc/gen/sysctlnametomib.c:1.5 src/lib/libc/gen/sysctlnametomib.c:1.6
--- src/lib/libc/gen/sysctlnametomib.c:1.5 Mon Dec 13 21:07:55 2010
+++ src/lib/libc/gen/sysctlnametomib.c Mon Dec 13 23:10:13 2010
@@ -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 __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)
+#else
+#ifdef __weak_alias
+__weak_alias(sysctlnametomib,_sysctlnametomib)
+#endif
#endif /* RUMP_ACTION */
/*
Index: src/lib/libc/net/if_indextoname.c
diff -u src/lib/libc/net/if_indextoname.c:1.6 src/lib/libc/net/if_indextoname.c:1.7
--- src/lib/libc/net/if_indextoname.c:1.6 Mon Dec 13 21:07:54 2010
+++ src/lib/libc/net/if_indextoname.c Mon Dec 13 23:10:12 2010
@@ -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:
