[src/trunk]: src/sys/rump Move a few stubs to where they really belong; allow...

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

details:   https://anonhg.NetBSD.org/src/rev/e4fd934595bc
branches:  trunk
changeset: 328971:e4fd934595bc
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat Apr 26 11:23:03 2014 +0000

description:
Move a few stubs to where they really belong; allows us to create
them as strong instead of weak symbols.

diffstat:

 sys/rump/librump/rumpnet/net_stub.c |   8 ++------
 sys/rump/net/lib/libsockin/sockin.c |  15 +++++++++++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r 8834e40253e6 -r e4fd934595bc sys/rump/librump/rumpnet/net_stub.c
--- a/sys/rump/librump/rumpnet/net_stub.c       Sat Apr 26 11:17:55 2014 +0000
+++ b/sys/rump/librump/rumpnet/net_stub.c       Sat Apr 26 11:23:03 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net_stub.c,v 1.15 2014/04/26 11:17:55 pooka Exp $      */
+/*     $NetBSD: net_stub.c,v 1.16 2014/04/26 11:23:03 pooka Exp $      */
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.15 2014/04/26 11:17:55 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.16 2014/04/26 11:23:03 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/protosw.h>
@@ -46,10 +46,6 @@
        panic("component not available");
 }
 
-__weak_alias(rtrequest,__rumpnet_stub);
-__weak_alias(ifunit,__rumpnet_stub);
-__weak_alias(ifreq_setaddr,__rumpnet_stub);
-
 /*
  * Weak symbols so that we can optionally leave components out.
  * (would be better to fix sys/net* to be more modular, though)
diff -r 8834e40253e6 -r e4fd934595bc sys/rump/net/lib/libsockin/sockin.c
--- a/sys/rump/net/lib/libsockin/sockin.c       Sat Apr 26 11:17:55 2014 +0000
+++ b/sys/rump/net/lib/libsockin/sockin.c       Sat Apr 26 11:23:03 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sockin.c,v 1.36 2014/03/13 01:40:30 pooka Exp $        */
+/*     $NetBSD: sockin.c,v 1.37 2014/04/26 11:23:03 pooka Exp $        */
 
 /*
  * Copyright (c) 2008, 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.36 2014/03/13 01:40:30 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.37 2014/04/26 11:23:03 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/condvar.h>
@@ -560,3 +560,14 @@
        return rumpcomp_sockin_setsockopt(SO2S(so), sopt->sopt_level,
            sopt->sopt_name, sopt->sopt_data, sopt->sopt_size);
 }
+
+int sockin_unavailable(void);
+int
+sockin_unavailable(void)
+{
+
+        panic("interface not available in with sockin");
+}
+__strong_alias(rtrequest,sockin_unavailable);
+__strong_alias(ifunit,sockin_unavailable);
+__strong_alias(ifreq_setaddr,sockin_unavailable);