Module: xenomai-2.5
Branch: master
Commit: 70354bbcffeafafaafbefc3b42dd99fbc95bb537
URL:    
http://git.xenomai.org/?p=xenomai-2.5.git;a=commit;h=70354bbcffeafafaafbefc3b42dd99fbc95bb537

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Thu Apr  1 22:00:23 2010 +0200

common: unconditionnaly map the semaphore heaps in user-space.

This is needed for the vdso feature check, now mandatory, even without the
FASTSYNCH feature.

---

 src/skins/common/sem_heap.h    |    4 ----
 src/testsuite/unit/Makefile.am |    4 ----
 src/testsuite/unit/Makefile.in |   29 +++++++++++++----------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/skins/common/sem_heap.h b/src/skins/common/sem_heap.h
index d799a37..16dedda 100644
--- a/src/skins/common/sem_heap.h
+++ b/src/skins/common/sem_heap.h
@@ -3,10 +3,6 @@
 
 #include <xeno_config.h>
 
-#ifdef CONFIG_XENO_FASTSYNCH
 void xeno_init_sem_heaps(void);
-#else /* !CONFIG_XENO_FASTSYNCH */
-#define xeno_init_sem_heaps()
-#endif /* !CONFIG_XENO_FASTSYNCH */
 
 #endif /* XENO_SEM_HEAP_H */
diff --git a/src/testsuite/unit/Makefile.am b/src/testsuite/unit/Makefile.am
index d94e53f..8966883 100644
--- a/src/testsuite/unit/Makefile.am
+++ b/src/testsuite/unit/Makefile.am
@@ -92,8 +92,6 @@ cond_torture_native_LDADD = \
        ../../skins/common/libxenomai.la \
        -lpthread -lm
 
-if CONFIG_XENO_FASTSYNCH
-
 check_vdso_SOURCES = check-vdso.c
 
 check_vdso_CPPFLAGS = \
@@ -107,8 +105,6 @@ check_vdso_LDADD = \
        ../../skins/common/libxenomai.la \
        -lpthread -lm
 
-endif
-
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(rundir)
        @sed -e's,@exec_prefix\@,$(exec_prefix),g' $(srcdir)/runinfo.in > 
$(DESTDIR)$(rundir)/.runinfo
diff --git a/src/testsuite/unit/Makefile.in b/src/testsuite/unit/Makefile.in
index 3d536a8..5125678 100644
--- a/src/testsuite/unit/Makefile.in
+++ b/src/testsuite/unit/Makefile.in
@@ -64,13 +64,10 @@ arith_DEPENDENCIES = ../../skins/native/libnative.la \
 arith_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(arith_LDFLAGS) \
        $(LDFLAGS) -o $@
-am__check_vdso_SOURCES_DIST = check-vdso.c
-...@config_xeno_fastsynch_true@am_check_vdso_OBJECTS =  \
-...@config_xeno_fastsynch_true@        check_vdso-check-vdso.$(OBJEXT)
+am_check_vdso_OBJECTS = check_vdso-check-vdso.$(OBJEXT)
 check_vdso_OBJECTS = $(am_check_vdso_OBJECTS)
-...@config_xeno_fastsynch_true@check_vdso_DEPENDENCIES =  \
-...@config_xeno_fastsynch_true@        ../../skins/native/libnative.la \
-...@config_xeno_fastsynch_true@        ../../skins/common/libxenomai.la
+check_vdso_DEPENDENCIES = ../../skins/native/libnative.la \
+       ../../skins/common/libxenomai.la
 check_vdso_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(check_vdso_LDFLAGS) $(LDFLAGS) -o $@
@@ -130,7 +127,7 @@ SOURCES = $(arith_SOURCES) $(check_vdso_SOURCES) \
        $(cond_torture_native_SOURCES) $(cond_torture_posix_SOURCES) \
        $(mutex_torture_native_SOURCES) $(mutex_torture_posix_SOURCES) \
        $(wakeup_time_SOURCES)
-DIST_SOURCES = $(arith_SOURCES) $(am__check_vdso_SOURCES_DIST) \
+DIST_SOURCES = $(arith_SOURCES) $(check_vdso_SOURCES) \
        $(cond_torture_native_SOURCES) $(cond_torture_posix_SOURCES) \
        $(mutex_torture_native_SOURCES) $(mutex_torture_posix_SOURCES) \
        $(wakeup_time_SOURCES)
@@ -368,16 +365,16 @@ cond_torture_native_LDADD = \
        ../../skins/common/libxenomai.la \
        -lpthread -lm
 
-...@config_xeno_fastsynch_true@check_vdso_SOURCES = check-vdso.c
-...@config_xeno_fastsynch_true@check_vdso_CPPFLAGS = \
-...@config_xeno_fastsynch_true@        @XENO_USER_CFLAGS@ \
-...@config_xeno_fastsynch_true@        -I$(top_srcdir)/include
+check_vdso_SOURCES = check-vdso.c
+check_vdso_CPPFLAGS = \
+       @XENO_USER_CFLAGS@ \
+       -I$(top_srcdir)/include
 
-...@config_xeno_fastsynch_true@check_vdso_LDFLAGS = @XENO_USER_LDFLAGS@
-...@config_xeno_fastsynch_true@check_vdso_LDADD = \
-...@config_xeno_fastsynch_true@        ../../skins/native/libnative.la \
-...@config_xeno_fastsynch_true@        ../../skins/common/libxenomai.la \
-...@config_xeno_fastsynch_true@        -lpthread -lm
+check_vdso_LDFLAGS = @XENO_USER_LDFLAGS@
+check_vdso_LDADD = \
+       ../../skins/native/libnative.la \
+       ../../skins/common/libxenomai.la \
+       -lpthread -lm
 
 EXTRA_DIST = runinfo.in
 all: all-am


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to