Module: xenomai-forge
Branch: master
Commit: 50dda51b04dabe27385e0e469e6a39708bc50f4d
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=50dda51b04dabe27385e0e469e6a39708bc50f4d
Author: Philippe Gerum <r...@xenomai.org>
Date: Wed Jul 3 12:24:51 2013 +0200
include/nocore: introduce real-time core-agnostic include tree
Some headers are shared between cobalt and mercury cores. These files
are arch-independent, and user-space only in essence.
---
configure | 3 +-
configure.in | 1 +
include/Makefile.am | 1 +
include/Makefile.in | 6 +-
include/cobalt/asm-generic/Makefile.am | 1 -
include/cobalt/asm-generic/Makefile.in | 1 -
include/copperplate/syncobj.h | 2 +-
include/nocore/Makefile.am | 4 +
include/nocore/Makefile.in | 558 +++++++++++++++++++++++
include/{cobalt/asm-generic => nocore}/atomic.h | 6 +-
lib/cobalt/internal.h | 2 +-
lib/cobalt/printf.c | 2 +-
testsuite/clocktest/clocktest.c | 2 +-
testsuite/unit/check-vdso.c | 2 +-
14 files changed, 577 insertions(+), 14 deletions(-)
diff --git a/configure b/configure
index 3c1fd79..aafdea1 100755
--- a/configure
+++ b/configure
@@ -14101,7 +14101,7 @@ fi
-ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile
scripts/xeno-config:scripts/xeno-config-$rtcore_type.in scripts/xeno
lib/Makefile lib/cobalt/Makefile lib/cobalt/sysdeps/Makefile
lib/cobalt/sysdeps/arm/Makefile lib/cobalt/sysdeps/powerpc/Makefile
lib/cobalt/sysdeps/blackfin/Makefile lib/cobalt/sysdeps/x86/Makefile
lib/cobalt/sysdeps/nios2/Makefile lib/cobalt/sysdeps/sh/Makefile
lib/copperplate/Makefile lib/copperplate/regd/Makefile lib/alchemy/Makefile
lib/vxworks/Makefile lib/psos/Makefile lib/analogy/Makefile
lib/include/Makefile testsuite/Makefile testsuite/latency/Makefile
testsuite/cyclic/Makefile testsuite/switchtest/Makefile
testsuite/clocktest/Makefile testsuite/unit/Makefile
testsuite/xeno-test/Makefile testsuite/regression/Makefile
testsuite/regression/posix/Makefile utils/Makefile utils/can/Makefile
utils/analogy/Makefile utils/ps/Makefile utils/slackspot/Makefile
include/Makefile include/cobalt/uapi/Makefile include/cobalt/uapi/sys/Makefile
inc
lude/cobalt/uapi/rtdm/Makefile include/cobalt/asm-generic/Makefile
include/cobalt/asm-generic/uapi/Makefile
include/cobalt/asm-generic/ipipe/Makefile include/cobalt/asm-blackfin/Makefile
include/cobalt/asm-blackfin/uapi/Makefile include/cobalt/asm-x86/Makefile
include/cobalt/asm-x86/uapi/Makefile include/cobalt/asm-powerpc/Makefile
include/cobalt/asm-powerpc/uapi/Makefile include/cobalt/asm-arm/Makefile
include/cobalt/asm-arm/uapi/Makefile include/cobalt/asm-nios2/Makefile
include/cobalt/asm-nios2/uapi/Makefile include/cobalt/asm-sh/Makefile
include/cobalt/asm-sh/uapi/Makefile include/cobalt/Makefile
include/cobalt/sys/Makefile include/cobalt/kernel/Makefile
include/rtdm/Makefile include/analogy/Makefile include/mercury/Makefile
include/copperplate/Makefile include/alchemy/Makefile include/vxworks/Makefile
include/psos/Makefile"
+ac_config_files="$ac_config_files Makefile config/Makefile scripts/Makefile
scripts/xeno-config:scripts/xeno-config-$rtcore_type.in scripts/xeno
lib/Makefile lib/cobalt/Makefile lib/cobalt/sysdeps/Makefile
lib/cobalt/sysdeps/arm/Makefile lib/cobalt/sysdeps/powerpc/Makefile
lib/cobalt/sysdeps/blackfin/Makefile lib/cobalt/sysdeps/x86/Makefile
lib/cobalt/sysdeps/nios2/Makefile lib/cobalt/sysdeps/sh/Makefile
lib/copperplate/Makefile lib/copperplate/regd/Makefile lib/alchemy/Makefile
lib/vxworks/Makefile lib/psos/Makefile lib/analogy/Makefile
lib/include/Makefile testsuite/Makefile testsuite/latency/Makefile
testsuite/cyclic/Makefile testsuite/switchtest/Makefile
testsuite/clocktest/Makefile testsuite/unit/Makefile
testsuite/xeno-test/Makefile testsuite/regression/Makefile
testsuite/regression/posix/Makefile utils/Makefile utils/can/Makefile
utils/analogy/Makefile utils/ps/Makefile utils/slackspot/Makefile
include/Makefile include/nocore/Makefile include/cobalt/uapi/Makefile
include/coba
lt/uapi/sys/Makefile include/cobalt/uapi/rtdm/Makefile
include/cobalt/asm-generic/Makefile include/cobalt/asm-generic/uapi/Makefile
include/cobalt/asm-generic/ipipe/Makefile include/cobalt/asm-blackfin/Makefile
include/cobalt/asm-blackfin/uapi/Makefile include/cobalt/asm-x86/Makefile
include/cobalt/asm-x86/uapi/Makefile include/cobalt/asm-powerpc/Makefile
include/cobalt/asm-powerpc/uapi/Makefile include/cobalt/asm-arm/Makefile
include/cobalt/asm-arm/uapi/Makefile include/cobalt/asm-nios2/Makefile
include/cobalt/asm-nios2/uapi/Makefile include/cobalt/asm-sh/Makefile
include/cobalt/asm-sh/uapi/Makefile include/cobalt/Makefile
include/cobalt/sys/Makefile include/cobalt/kernel/Makefile
include/rtdm/Makefile include/analogy/Makefile include/mercury/Makefile
include/copperplate/Makefile include/alchemy/Makefile include/vxworks/Makefile
include/psos/Makefile"
if test \! x$XENO_MAYBE_DOCDIR = x ; then
@@ -15217,6 +15217,7 @@ do
"utils/ps/Makefile") CONFIG_FILES="$CONFIG_FILES utils/ps/Makefile" ;;
"utils/slackspot/Makefile") CONFIG_FILES="$CONFIG_FILES
utils/slackspot/Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+ "include/nocore/Makefile") CONFIG_FILES="$CONFIG_FILES
include/nocore/Makefile" ;;
"include/cobalt/uapi/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/uapi/Makefile" ;;
"include/cobalt/uapi/sys/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/uapi/sys/Makefile" ;;
"include/cobalt/uapi/rtdm/Makefile") CONFIG_FILES="$CONFIG_FILES
include/cobalt/uapi/rtdm/Makefile" ;;
diff --git a/configure.in b/configure.in
index 03fb19e..ef15dc2 100644
--- a/configure.in
+++ b/configure.in
@@ -829,6 +829,7 @@ AC_CONFIG_FILES([ \
utils/ps/Makefile \
utils/slackspot/Makefile \
include/Makefile \
+ include/nocore/Makefile \
include/cobalt/uapi/Makefile \
include/cobalt/uapi/sys/Makefile \
include/cobalt/uapi/rtdm/Makefile \
diff --git a/include/Makefile.am b/include/Makefile.am
index 3c970a1..1298550 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -3,6 +3,7 @@ nodist_include_HEADERS=$(CONFIG_HEADER)
include_HEADERS = version.h
SUBDIRS = \
+ nocore \
copperplate \
alchemy \
psos \
diff --git a/include/Makefile.in b/include/Makefile.in
index c27407a..d6a592f 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -127,8 +127,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
distdir
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = copperplate alchemy psos vxworks analogy cobalt rtdm \
- mercury
+DIST_SUBDIRS = nocore copperplate alchemy psos vxworks analogy cobalt \
+ rtdm mercury
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -321,7 +321,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
nodist_include_HEADERS = $(CONFIG_HEADER)
include_HEADERS = version.h $(am__append_1)
-SUBDIRS = copperplate alchemy psos vxworks $(am__append_2) \
+SUBDIRS = nocore copperplate alchemy psos vxworks $(am__append_2) \
$(am__append_3)
EXTRA_DIST = testing
all: all-recursive
diff --git a/include/cobalt/asm-generic/Makefile.am
b/include/cobalt/asm-generic/Makefile.am
index 6371d60..cff1c94 100644
--- a/include/cobalt/asm-generic/Makefile.am
+++ b/include/cobalt/asm-generic/Makefile.am
@@ -2,7 +2,6 @@ includesubdir = $(includedir)/asm-generic
includesub_HEADERS = \
arith.h \
- atomic.h \
features.h \
machine.h \
mayday.h \
diff --git a/include/cobalt/asm-generic/Makefile.in
b/include/cobalt/asm-generic/Makefile.in
index 73ce649..7655bb6 100644
--- a/include/cobalt/asm-generic/Makefile.in
+++ b/include/cobalt/asm-generic/Makefile.in
@@ -313,7 +313,6 @@ top_srcdir = @top_srcdir@
includesubdir = $(includedir)/asm-generic
includesub_HEADERS = \
arith.h \
- atomic.h \
features.h \
machine.h \
mayday.h \
diff --git a/include/copperplate/syncobj.h b/include/copperplate/syncobj.h
index 3a8b67a..c94bfea 100644
--- a/include/copperplate/syncobj.h
+++ b/include/copperplate/syncobj.h
@@ -43,7 +43,7 @@ struct syncstate {
#ifdef CONFIG_XENO_COBALT
-#include <asm-generic/xenomai/atomic.h>
+#include <nocore/atomic.h>
#include <cobalt/uapi/monitor.h>
struct syncobj_corespec {
diff --git a/include/nocore/Makefile.am b/include/nocore/Makefile.am
new file mode 100644
index 0000000..fdd17cd
--- /dev/null
+++ b/include/nocore/Makefile.am
@@ -0,0 +1,4 @@
+includesubdir = $(includedir)/nocore
+
+includesub_HEADERS = \
+ atomic.h
diff --git a/include/nocore/Makefile.in b/include/nocore/Makefile.in
new file mode 100644
index 0000000..4376f15
--- /dev/null
+++ b/include/nocore/Makefile.in
@@ -0,0 +1,558 @@
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = include/nocore
+DIST_COMMON = $(includesub_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \
+ $(top_srcdir)/config/docbook.m4 \
+ $(top_srcdir)/config/libtool.m4 \
+ $(top_srcdir)/config/ltoptions.m4 \
+ $(top_srcdir)/config/ltsugar.m4 \
+ $(top_srcdir)/config/ltversion.m4 \
+ $(top_srcdir)/config/lt~obsolete.m4 \
+ $(top_srcdir)/config/version $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/lib/include/xeno_config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(includesubdir)"
+HEADERS = $(includesub_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+A2X = @A2X@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+ASCIIDOC = @ASCIIDOC@
+ASCIIDODC = @ASCIIDODC@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_OBJEXT = @BUILD_OBJEXT@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+CHECKFLAGS = @CHECKFLAGS@
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+CPP_FOR_BUILD = @CPP_FOR_BUILD@
+CYGPATH_W = @CYGPATH_W@
+DBX_DOC_ROOT = @DBX_DOC_ROOT@
+DBX_FOP = @DBX_FOP@
+DBX_GEN_DOC_ROOT = @DBX_GEN_DOC_ROOT@
+DBX_LINT = @DBX_LINT@
+DBX_MAYBE_NONET = @DBX_MAYBE_NONET@
+DBX_ROOT = @DBX_ROOT@
+DBX_XSLTPROC = @DBX_XSLTPROC@
+DBX_XSL_ROOT = @DBX_XSL_ROOT@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOXYGEN = @DOXYGEN@
+DOXYGEN_HAVE_DOT = @DOXYGEN_HAVE_DOT@
+DOXYGEN_SHOW_INCLUDE_FILES = @DOXYGEN_SHOW_INCLUDE_FILES@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LATEX_BATCHMODE = @LATEX_BATCHMODE@
+LATEX_MODE = @LATEX_MODE@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LD_FILE_OPTION = @LD_FILE_OPTION@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+W3M = @W3M@
+XENO_BUILD_STRING = @XENO_BUILD_STRING@
+XENO_COBALT_CFLAGS = @XENO_COBALT_CFLAGS@
+XENO_FUSE_CFLAGS = @XENO_FUSE_CFLAGS@
+XENO_HOST_STRING = @XENO_HOST_STRING@
+XENO_LIB_LDFLAGS = @XENO_LIB_LDFLAGS@
+XENO_MAYBE_DOCDIR = @XENO_MAYBE_DOCDIR@
+XENO_POSIX_WRAPPERS = @XENO_POSIX_WRAPPERS@
+XENO_TARGET_ARCH = @XENO_TARGET_ARCH@
+XENO_TEST_DIR = @XENO_TEST_DIR@
+XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@
+XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@
+XENO_USER_CFLAGS = @XENO_USER_CFLAGS@
+XENO_USER_LDADD = @XENO_USER_LDADD@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+includesubdir = $(includedir)/nocore
+includesub_HEADERS = \
+ atomic.h
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am
$(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
include/nocore/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign include/nocore/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-includesubHEADERS: $(includesub_HEADERS)
+ @$(NORMAL_INSTALL)
+ @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(includesubdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(includesubdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesubdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesubdir)" || exit $$?; \
+ done
+
+uninstall-includesubHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(includesub_HEADERS)'; test -n "$(includesubdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(includesubdir)'; $(am__uninstall_files_from_dir)
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+cscopelist: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
{} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx
{} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(HEADERS)
+installdirs:
+ for dir in "$(DESTDIR)$(includesubdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f
$(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-includesubHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-includesubHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool cscopelist ctags distclean distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am \
+ install-includesubHEADERS install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags uninstall uninstall-am \
+ uninstall-includesubHEADERS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/include/cobalt/asm-generic/atomic.h b/include/nocore/atomic.h
similarity index 93%
rename from include/cobalt/asm-generic/atomic.h
rename to include/nocore/atomic.h
index ae44828..8cd236a 100644
--- a/include/cobalt/asm-generic/atomic.h
+++ b/include/nocore/atomic.h
@@ -16,8 +16,8 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#ifndef _COBALT_ASM_GENERIC_ATOMIC_H
-#define _COBALT_ASM_GENERIC_ATOMIC_H
+#ifndef _NOCORE_ATOMIC_H
+#define _NOCORE_ATOMIC_H
#include <xeno_config.h>
@@ -58,4 +58,4 @@ typedef struct {
#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
-#endif /* _COBALT_ASM_GENERIC_ATOMIC_H */
+#endif /* _NOCORE_ATOMIC_H */
diff --git a/lib/cobalt/internal.h b/lib/cobalt/internal.h
index 5cf4685..eec4f91 100644
--- a/lib/cobalt/internal.h
+++ b/lib/cobalt/internal.h
@@ -4,7 +4,7 @@
#include <signal.h>
#include <pthread.h>
#include <errno.h>
-#include <asm-generic/xenomai/atomic.h>
+#include <nocore/atomic.h>
#include <cobalt/uapi/sys/synch.h>
#include <cobalt/uapi/sys/vdso.h>
#include <cobalt/uapi/mutex.h>
diff --git a/lib/cobalt/printf.c b/lib/cobalt/printf.c
index c0bb78e..25f9ba6 100644
--- a/lib/cobalt/printf.c
+++ b/lib/cobalt/printf.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#include <syslog.h>
#include <rtdk.h>
-#include <asm-generic/xenomai/atomic.h>
+#include <nocore/atomic.h>
#include <asm-generic/stack.h>
#include "current.h"
#include "internal.h"
diff --git a/testsuite/clocktest/clocktest.c b/testsuite/clocktest/clocktest.c
index d587720..6bdc968 100644
--- a/testsuite/clocktest/clocktest.c
+++ b/testsuite/clocktest/clocktest.c
@@ -29,7 +29,7 @@
#include <sys/syscall.h>
#include <sys/mman.h>
#include <sys/time.h>
-#include <asm-generic/xenomai/atomic.h>
+#include <nocore/atomic.h>
#include <cobalt/uapi/sys/vdso.h>
#include <xeno_config.h>
diff --git a/testsuite/unit/check-vdso.c b/testsuite/unit/check-vdso.c
index c97758b..6b25085 100644
--- a/testsuite/unit/check-vdso.c
+++ b/testsuite/unit/check-vdso.c
@@ -5,7 +5,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <asm-generic/xenomai/atomic.h>
+#include <nocore/atomic.h>
#include <cobalt/uapi/sys/vdso.h>
extern unsigned long cobalt_sem_heap[2];
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
