Module: xenomai-2.6
Branch: master
Commit: 93974a8d65e0c3c1e45cc40c6e3af41f90ab1a99
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=93974a8d65e0c3c1e45cc40c6e3af41f90ab1a99
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Fri Mar 8 07:39:23 2013 +0100
skins: avoid multiply defined symbols
By only including asm/xenomai/bits/bind.h in src/skins/common/bind.c.
bind.c interface is declared in asm-generic/bids/bind.h so, skins can include
thins file instead of the architecture-specific bind.h, so as to avoid symbols
multiple definitions.
---
include/asm-nios2/bits/bind.h | 2 +-
include/asm-sh/bits/bind.h | 2 --
src/skins/native/init.c | 2 +-
src/skins/posix/init.c | 2 +-
src/skins/psos+/init.c | 2 +-
src/skins/rtdm/init.c | 2 +-
src/skins/uitron/init.c | 2 +-
src/skins/vrtx/init.c | 2 +-
src/skins/vxworks/init.c | 2 +-
9 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/include/asm-nios2/bits/bind.h b/include/asm-nios2/bits/bind.h
index 067e7e2..668d8b8 100644
--- a/include/asm-nios2/bits/bind.h
+++ b/include/asm-nios2/bits/bind.h
@@ -12,7 +12,7 @@
#include <asm-generic/xenomai/bits/bind.h>
-__attribute__((weak)) volatile void *xeno_nios2_hrclock = NULL;
+volatile void *xeno_nios2_hrclock = NULL;
static inline void xeno_nios2_features_check(struct xnfeatinfo *finfo)
{
diff --git a/include/asm-sh/bits/bind.h b/include/asm-sh/bits/bind.h
index 3b2b54d..bd25f80 100644
--- a/include/asm-sh/bits/bind.h
+++ b/include/asm-sh/bits/bind.h
@@ -14,10 +14,8 @@
struct xnarch_tsc_area;
-__attribute__((weak))
volatile struct xnarch_tsc_area *xeno_sh_tsc = NULL;
-__attribute__((weak))
volatile unsigned long *xeno_sh_tcnt = NULL;
static volatile void *__xeno_kmem_map(unsigned long pa, unsigned int pagesz)
diff --git a/src/skins/native/init.c b/src/skins/native/init.c
index 2c36444..5d433b3 100644
--- a/src/skins/native/init.c
+++ b/src/skins/native/init.c
@@ -24,7 +24,7 @@
#include <pthread.h>
#include <native/syscall.h>
#include <native/task.h>
-#include <asm/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bits/bind.h>
int __native_muxid = -1;
static int fork_handler_registered;
diff --git a/src/skins/posix/init.c b/src/skins/posix/init.c
index 332081a..83d27a6 100644
--- a/src/skins/posix/init.c
+++ b/src/skins/posix/init.c
@@ -30,7 +30,7 @@
#include <posix/mutex.h>
#include <rtdk.h>
-#include <asm/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bits/bind.h>
int __pse51_muxid = -1;
int __pse51_rtdm_muxid = -1;
diff --git a/src/skins/psos+/init.c b/src/skins/psos+/init.c
index b72825f..5098f91 100644
--- a/src/skins/psos+/init.c
+++ b/src/skins/psos+/init.c
@@ -20,7 +20,7 @@
#include <errno.h>
#include <sys/mman.h>
#include <psos+/psos.h>
-#include <asm/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bits/bind.h>
int __psos_muxid = -1;
diff --git a/src/skins/rtdm/init.c b/src/skins/rtdm/init.c
index dbbcbb1..9672486 100644
--- a/src/skins/rtdm/init.c
+++ b/src/skins/rtdm/init.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <rtdm/syscall.h>
-#include <asm/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bits/bind.h>
int __rtdm_muxid = -1;
diff --git a/src/skins/uitron/init.c b/src/skins/uitron/init.c
index a6cc77f..0ffc8bd 100644
--- a/src/skins/uitron/init.c
+++ b/src/skins/uitron/init.c
@@ -20,7 +20,7 @@
#include <errno.h>
#include <sys/mman.h>
#include <uitron/uitron.h>
-#include <asm/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bits/bind.h>
int __uitron_muxid = -1;
diff --git a/src/skins/vrtx/init.c b/src/skins/vrtx/init.c
index 8a81660..d3d6cdb 100644
--- a/src/skins/vrtx/init.c
+++ b/src/skins/vrtx/init.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <pthread.h>
#include <vrtx/vrtx.h>
-#include <asm/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bits/bind.h>
int __vrtx_muxid = -1;
diff --git a/src/skins/vxworks/init.c b/src/skins/vxworks/init.c
index 181b575..b2cdad4 100644
--- a/src/skins/vxworks/init.c
+++ b/src/skins/vxworks/init.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <pthread.h>
#include <vxworks/vxworks.h>
-#include <asm/xenomai/bits/bind.h>
+#include <asm-generic/xenomai/bits/bind.h>
int __vxworks_muxid = -1;
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
