Module: xenomai-forge Branch: master Commit: 13be7f09edcd21586998f3c17c8d47b7edc4f8ef URL: http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=13be7f09edcd21586998f3c17c8d47b7edc4f8ef
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org> Date: Mon Nov 7 21:31:25 2011 +0100 arm: fix __xn_rdtsc --- configure | 4 ++-- configure.in | 2 +- lib/include/xeno_config.h.in | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index ba6b773..fdde4ce 100755 --- a/configure +++ b/configure @@ -12581,9 +12581,9 @@ $as_echo "#define CONFIG_XENO_ARM_SA1100 1" >>confdefs.h test x$CONFIG_XENO_CPU_XSC3 = xy && $as_echo "#define CONFIG_XENO_CPU_XSC3 1" >>confdefs.h -test $XNARCH_ARM_TSC_TYPE && +test $CONFIG_XENO_ARM_TSC_TYPE && cat >>confdefs.h <<_ACEOF -#define XNARCH_ARM_TSC_TYPE $XNARCH_ARM_TSC_TYPE +#define CONFIG_XENO_ARM_TSC_TYPE $CONFIG_XENO_ARM_TSC_TYPE _ACEOF if test "$enable_shared" = 'yes'; then diff --git a/configure.in b/configure.in index 259ba32..04b615b 100644 --- a/configure.in +++ b/configure.in @@ -498,7 +498,7 @@ test -n "$CONFIG_XENO_ARM_ARCH" && AC_DEFINE_UNQUOTED(CONFIG_XENO_ARM_ARCH,$CONF test x$CONFIG_XENO_ARM_SA1100 = xy && AC_DEFINE(CONFIG_XENO_ARM_SA1100,1,[config]) test x$CONFIG_XENO_CPU_XSC3 = xy && AC_DEFINE(CONFIG_XENO_CPU_XSC3,1,[config]) -test $XNARCH_ARM_TSC_TYPE && AC_DEFINE_UNQUOTED(XNARCH_ARM_TSC_TYPE,$XNARCH_ARM_TSC_TYPE,[config]) +test $CONFIG_XENO_ARM_TSC_TYPE && AC_DEFINE_UNQUOTED(CONFIG_XENO_ARM_TSC_TYPE,$CONFIG_XENO_ARM_TSC_TYPE,[config]) AM_CONDITIONAL(CONFIG_XENO_SHARED,[test "$enable_shared" = 'yes']) # Default sampling period (ns) used in various tests diff --git a/lib/include/xeno_config.h.in b/lib/include/xeno_config.h.in index fec956f..cebf430 100644 --- a/lib/include/xeno_config.h.in +++ b/lib/include/xeno_config.h.in @@ -13,6 +13,9 @@ #undef CONFIG_XENO_ARM_SA1100 /* config */ +#undef CONFIG_XENO_ARM_TSC_TYPE + +/* config */ #undef CONFIG_XENO_ASYNC_CANCEL /* Build system alias */ @@ -174,9 +177,6 @@ /* Version number of package */ #undef VERSION -/* config */ -#undef XNARCH_ARM_TSC_TYPE - /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ #undef YYTEXT_POINTER _______________________________________________ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git