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

Author: Philippe Gerum <r...@xenomai.org>
Date:   Mon Dec 28 17:57:53 2009 +0100

nucleus: nucleus/xnvdso.h -> nucleus/vdso.h

---

 include/asm-generic/Makefile.in      |    1 +
 include/nucleus/Makefile.am          |    4 +-
 include/nucleus/Makefile.in          |    1 +
 include/nucleus/{xnvdso.h => vdso.h} |    8 +++---
 ksrc/nucleus/module.c                |    2 +-
 ksrc/nucleus/shadow.c                |    2 +-
 src/testsuite/unit/Makefile.in       |   47 ++++++++++++++++++++++++++++++---
 src/testsuite/unit/check-vdso.c      |    2 +-
 8 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/include/asm-generic/Makefile.in b/include/asm-generic/Makefile.in
index 013a935..147224d 100644
--- a/include/asm-generic/Makefile.in
+++ b/include/asm-generic/Makefile.in
@@ -283,6 +283,7 @@ includesub_HEADERS = \
        arith.h \
        features.h \
        hal.h \
+       pci_ids.h \
        syscall.h \
        system.h \
        wrappers.h
diff --git a/include/nucleus/Makefile.am b/include/nucleus/Makefile.am
index 26d3fa2..3a6a024 100644
--- a/include/nucleus/Makefile.am
+++ b/include/nucleus/Makefile.am
@@ -33,6 +33,6 @@ includesub_HEADERS = \
        timer.h \
        trace.h \
        types.h \
+       vdso.h \
        version.h \
-       xenomai.h \
-       xnvdso.h
+       xenomai.h
diff --git a/include/nucleus/Makefile.in b/include/nucleus/Makefile.in
index 7588db6..b09d4f7 100644
--- a/include/nucleus/Makefile.in
+++ b/include/nucleus/Makefile.in
@@ -274,6 +274,7 @@ includesub_HEADERS = \
        timer.h \
        trace.h \
        types.h \
+       vdso.h \
        version.h \
        xenomai.h
 
diff --git a/include/nucleus/xnvdso.h b/include/nucleus/vdso.h
similarity index 93%
rename from include/nucleus/xnvdso.h
rename to include/nucleus/vdso.h
index 0b51d94..65e081a 100644
--- a/include/nucleus/xnvdso.h
+++ b/include/nucleus/vdso.h
@@ -1,7 +1,7 @@
-#ifndef _XENO_NUCLEUS_XNVDSO_H
-#define _XENO_NUCLEUS_XNVDSO_H
+#ifndef _XENO_NUCLEUS_VDSO_H
+#define _XENO_NUCLEUS_VDSO_H
 
-/*!\file xnvdso.h
+/*!\file vdso.h
  * \brief Definitions for global semaphore heap shared objects
  * \author Wolfgang Mauerer
  *
@@ -58,4 +58,4 @@ static inline int xnvdso_test_feature(unsigned long long 
feature)
 }
 
 extern void xnheap_init_vdso(void);
-#endif /* _XENO_NUCLEUS_XNVDSO_H */
+#endif /* _XENO_NUCLEUS_VDSO_H */
diff --git a/ksrc/nucleus/module.c b/ksrc/nucleus/module.c
index 0a17661..84cec06 100644
--- a/ksrc/nucleus/module.c
+++ b/ksrc/nucleus/module.c
@@ -36,7 +36,7 @@
 #include <nucleus/select.h>
 #include <asm/xenomai/bits/init.h>
 #ifdef CONFIG_XENO_OPT_PERVASIVE
-#include <nucleus/xnvdso.h>
+#include <nucleus/vdso.h>
 #else
 static inline void xnheap_init_vdso(void) { }
 #endif /* CONFIG_XENO_OPT_PERVASIVE */
diff --git a/ksrc/nucleus/shadow.c b/ksrc/nucleus/shadow.c
index 06f10f3..22bac6f 100644
--- a/ksrc/nucleus/shadow.c
+++ b/ksrc/nucleus/shadow.c
@@ -50,7 +50,7 @@
 #include <nucleus/trace.h>
 #include <nucleus/stat.h>
 #include <nucleus/sys_ppd.h>
-#include <nucleus/xnvdso.h>
+#include <nucleus/vdso.h>
 #include <asm/xenomai/features.h>
 #include <asm/xenomai/syscall.h>
 #include <asm/xenomai/bits/shadow.h>
diff --git a/src/testsuite/unit/Makefile.in b/src/testsuite/unit/Makefile.in
index 9acb898..22ffe50 100644
--- a/src/testsuite/unit/Makefile.in
+++ b/src/testsuite/unit/Makefile.in
@@ -36,7 +36,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = arith$(EXEEXT) wakeup-time$(EXEEXT) \
-       mutex-torture-posix$(EXEEXT) mutex-torture-native$(EXEEXT)
+       mutex-torture-posix$(EXEEXT) mutex-torture-native$(EXEEXT) \
+       check-vdso$(EXEEXT)
 subdir = src/testsuite/unit
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -63,6 +64,12 @@ 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_OBJECTS = check_vdso-check-vdso.$(OBJEXT)
+check_vdso_OBJECTS = $(am_check_vdso_OBJECTS)
+check_vdso_DEPENDENCIES = ../../skins/native/libnative.la
+check_vdso_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(check_vdso_LDFLAGS) $(LDFLAGS) -o $@
 am_mutex_torture_native_OBJECTS =  \
        mutex_torture_native-mutex-torture.$(OBJEXT)
 mutex_torture_native_OBJECTS = $(am_mutex_torture_native_OBJECTS)
@@ -96,10 +103,12 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) 
$(LIBTOOLFLAGS) \
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-SOURCES = $(arith_SOURCES) $(mutex_torture_native_SOURCES) \
-       $(mutex_torture_posix_SOURCES) $(wakeup_time_SOURCES)
-DIST_SOURCES = $(arith_SOURCES) $(mutex_torture_native_SOURCES) \
-       $(mutex_torture_posix_SOURCES) $(wakeup_time_SOURCES)
+SOURCES = $(arith_SOURCES) $(check_vdso_SOURCES) \
+       $(mutex_torture_native_SOURCES) $(mutex_torture_posix_SOURCES) \
+       $(wakeup_time_SOURCES)
+DIST_SOURCES = $(arith_SOURCES) $(check_vdso_SOURCES) \
+       $(mutex_torture_native_SOURCES) $(mutex_torture_posix_SOURCES) \
+       $(wakeup_time_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -305,6 +314,16 @@ mutex_torture_native_LDADD = \
        ../../skins/native/libnative.la \
        -lpthread -lm
 
+check_vdso_SOURCES = check-vdso.c
+check_vdso_CPPFLAGS = \
+       @XENO_USER_CFLAGS@ \
+       -I$(top_srcdir)/include
+
+check_vdso_LDFLAGS = @XENO_USER_LDFLAGS@
+check_vdso_LDADD = \
+       ../../skins/native/libnative.la \
+       -lpthread -lm
+
 EXTRA_DIST = runinfo.in
 all: all-am
 
@@ -386,6 +405,9 @@ clean-binPROGRAMS:
 arith$(EXEEXT): $(arith_OBJECTS) $(arith_DEPENDENCIES) 
        @rm -f arith$(EXEEXT)
        $(arith_LINK) $(arith_OBJECTS) $(arith_LDADD) $(LIBS)
+check-vdso$(EXEEXT): $(check_vdso_OBJECTS) $(check_vdso_DEPENDENCIES) 
+       @rm -f check-vdso$(EXEEXT)
+       $(check_vdso_LINK) $(check_vdso_OBJECTS) $(check_vdso_LDADD) $(LIBS)
 mutex-torture-native$(EXEEXT): $(mutex_torture_native_OBJECTS) 
$(mutex_torture_native_DEPENDENCIES) 
        @rm -f mutex-torture-native$(EXEEXT)
        $(mutex_torture_native_LINK) $(mutex_torture_native_OBJECTS) 
$(mutex_torture_native_LDADD) $(LIBS)
@@ -404,6 +426,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ 
@am__qu...@./$(DEPDIR)/arith-arith-noinline...@am__quote@
 @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/arith-arith...@am__quote@
+...@amdep_true@@am__include@ 
@am__qu...@./$(DEPDIR)/check_vdso-check-vdso...@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__qu...@./$(DEPDIR)/mutex_torture_native-mutex-torture...@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__qu...@./$(DEPDIR)/mutex_torture_posix-mutex-torture...@am__quote@
 @AMDEP_TRUE@@am__include@ 
@am__qu...@./$(DEPDIR)/wakeup_time-wakeup-time...@am__quote@
@@ -457,6 +480,20 @@ arith-arith-noinline.obj: arith-noinline.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(arith_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
arith-arith-noinline.obj `if test -f 'arith-noinline.c'; then $(CYGPATH_W) 
'arith-noinline.c'; else $(CYGPATH_W) '$(srcdir)/arith-noinline.c'; fi`
 
+check_vdso-check-vdso.o: check-vdso.c
+...@am__fastdepcc_true@        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(check_vdso_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
check_vdso-check-vdso.o -MD -MP -MF $(DEPDIR)/check_vdso-check-vdso.Tpo -c -o 
check_vdso-check-vdso.o `test -f 'check-vdso.c' || echo 
'$(srcdir)/'`check-vdso.c
+...@am__fastdepcc_true@        $(am__mv) $(DEPDIR)/check_vdso-check-vdso.Tpo 
$(DEPDIR)/check_vdso-check-vdso.Po
+...@amdep_true@@am__fastdepCC_FALSE@   source='check-vdso.c' 
object='check_vdso-check-vdso.o' libtool=no @AMDEPBACKSLASH@
+...@amdep_true@@am__fastdepCC_FALSE@   DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
+...@am__fastdepcc_false@       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(check_vdso_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
check_vdso-check-vdso.o `test -f 'check-vdso.c' || echo 
'$(srcdir)/'`check-vdso.c
+
+check_vdso-check-vdso.obj: check-vdso.c
+...@am__fastdepcc_true@        $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(check_vdso_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
check_vdso-check-vdso.obj -MD -MP -MF $(DEPDIR)/check_vdso-check-vdso.Tpo -c -o 
check_vdso-check-vdso.obj `if test -f 'check-vdso.c'; then $(CYGPATH_W) 
'check-vdso.c'; else $(CYGPATH_W) '$(srcdir)/check-vdso.c'; fi`
+...@am__fastdepcc_true@        $(am__mv) $(DEPDIR)/check_vdso-check-vdso.Tpo 
$(DEPDIR)/check_vdso-check-vdso.Po
+...@amdep_true@@am__fastdepCC_FALSE@   source='check-vdso.c' 
object='check_vdso-check-vdso.obj' libtool=no @AMDEPBACKSLASH@
+...@amdep_true@@am__fastdepCC_FALSE@   DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
+...@am__fastdepcc_false@       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(check_vdso_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
check_vdso-check-vdso.obj `if test -f 'check-vdso.c'; then $(CYGPATH_W) 
'check-vdso.c'; else $(CYGPATH_W) '$(srcdir)/check-vdso.c'; fi`
+
 mutex_torture_native-mutex-torture.o: mutex-torture.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(mutex_torture_native_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
mutex_torture_native-mutex-torture.o -MD -MP -MF 
$(DEPDIR)/mutex_torture_native-mutex-torture.Tpo -c -o 
mutex_torture_native-mutex-torture.o `test -f 'mutex-torture.c' || echo 
'$(srcdir)/'`mutex-torture.c
 @am__fastdepCC_TRUE@   $(am__mv) 
$(DEPDIR)/mutex_torture_native-mutex-torture.Tpo 
$(DEPDIR)/mutex_torture_native-mutex-torture.Po
diff --git a/src/testsuite/unit/check-vdso.c b/src/testsuite/unit/check-vdso.c
index 250c6fa..f237791 100644
--- a/src/testsuite/unit/check-vdso.c
+++ b/src/testsuite/unit/check-vdso.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <asm/xenomai/syscall.h>
-#include <nucleus/xnvdso.h>
+#include <nucleus/vdso.h>
 
 extern unsigned long xeno_sem_heap[2];
 


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

Reply via email to