From 1b9119f8d4c3f40a61d4ee5403f0e7e5967c33d8 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 10 Jun 2011 15:48:01 -0400 Subject: [PATCH] Headers: move arch_*.h to urcu/arch/*.h Signed-off-by: Mathieu Desnoyers --- Makefile.am | 4 ++-- configure.ac | 2 +- urcu/{arch_alpha.h => arch/alpha.h} | 2 +- urcu/{arch_arm.h => arch/arm.h} | 2 +- urcu/{arch_gcc.h => arch/gcc.h} | 2 +- urcu/{arch_generic.h => arch/generic.h} | 0 urcu/{arch_ppc.h => arch/ppc.h} | 2 +- urcu/{arch_s390.h => arch/s390.h} | 2 +- urcu/{arch_sparc64.h => arch/sparc64.h} | 2 +- urcu/{arch_unknown.h => arch/unknown.h} | 0 urcu/{arch_x86.h => arch/x86.h} | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename urcu/{arch_alpha.h => arch/alpha.h} (97%) rename urcu/{arch_arm.h => arch/arm.h} (98%) rename urcu/{arch_gcc.h => arch/gcc.h} (97%) rename urcu/{arch_generic.h => arch/generic.h} (100%) rename urcu/{arch_ppc.h => arch/ppc.h} (98%) rename urcu/{arch_s390.h => arch/s390.h} (98%) rename urcu/{arch_sparc64.h => arch/sparc64.h} (98%) rename urcu/{arch_unknown.h => arch/unknown.h} (100%) rename urcu/{arch_x86.h => arch/x86.h} (98%) diff --git a/Makefile.am b/Makefile.am index 5723b21..e85c924 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,12 +8,12 @@ SUBDIRS = . tests include_HEADERS = urcu.h $(top_srcdir)/urcu-*.h nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \ urcu/rculist.h urcu/rcuhlist.h urcu/system.h urcu/urcu-futex.h \ - urcu/uatomic_generic.h urcu/arch_generic.h urcu/wfstack.h \ + urcu/uatomic_generic.h urcu/arch/generic.h urcu/wfstack.h \ urcu/wfqueue.h urcu/rculfstack.h urcu/rculfqueue.h \ urcu/urcu_ref.h urcu/map/*.h urcu/static/*.h nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic_arch.h urcu/config.h -EXTRA_DIST = $(top_srcdir)/urcu/arch_*.h $(top_srcdir)/urcu/uatomic_arch_*.h \ +EXTRA_DIST = $(top_srcdir)/urcu/arch/*.h $(top_srcdir)/urcu/uatomic_arch_*.h \ gpl-2.0.txt lgpl-2.1.txt lgpl-relicensing.txt \ README LICENSE compat_arch_x86.c diff --git a/configure.ac b/configure.ac index 179cb7d..85123a1 100644 --- a/configure.ac +++ b/configure.ac @@ -82,7 +82,7 @@ asm volatile("dmb":::"memory"); fi UATOMICSRC=urcu/uatomic_arch_$ARCHTYPE.h -ARCHSRC=urcu/arch_$ARCHTYPE.h +ARCHSRC=urcu/arch/$ARCHTYPE.h if test "x$ARCHTYPE" != xx86 -a "x$ARCHTYPE" != xppc; then APISRC=tests/api_gcc.h else diff --git a/urcu/arch_alpha.h b/urcu/arch/alpha.h similarity index 97% rename from urcu/arch_alpha.h rename to urcu/arch/alpha.h index d62ac17..300213e 100644 --- a/urcu/arch_alpha.h +++ b/urcu/arch/alpha.h @@ -43,6 +43,6 @@ static inline cycles_t caa_get_cycles (void) } #endif -#include +#include #endif /* _URCU_ARCH_ALPHA_H */ diff --git a/urcu/arch_arm.h b/urcu/arch/arm.h similarity index 98% rename from urcu/arch_arm.h rename to urcu/arch/arm.h index 92df8e9..b49f782 100644 --- a/urcu/arch_arm.h +++ b/urcu/arch/arm.h @@ -55,6 +55,6 @@ static inline cycles_t caa_get_cycles (void) } #endif -#include +#include #endif /* _URCU_ARCH_ARM_H */ diff --git a/urcu/arch_gcc.h b/urcu/arch/gcc.h similarity index 97% rename from urcu/arch_gcc.h rename to urcu/arch/gcc.h index 96efa0d..0c83c23 100644 --- a/urcu/arch_gcc.h +++ b/urcu/arch/gcc.h @@ -49,6 +49,6 @@ static inline cycles_t caa_get_cycles (void) } #endif -#include +#include #endif /* _URCU_ARCH_GCC_H */ diff --git a/urcu/arch_generic.h b/urcu/arch/generic.h similarity index 100% rename from urcu/arch_generic.h rename to urcu/arch/generic.h diff --git a/urcu/arch_ppc.h b/urcu/arch/ppc.h similarity index 98% rename from urcu/arch_ppc.h rename to urcu/arch/ppc.h index b0f5030..d7317bb 100644 --- a/urcu/arch_ppc.h +++ b/urcu/arch/ppc.h @@ -68,6 +68,6 @@ static inline cycles_t caa_get_cycles (void) } #endif -#include +#include #endif /* _URCU_ARCH_PPC_H */ diff --git a/urcu/arch_s390.h b/urcu/arch/s390.h similarity index 98% rename from urcu/arch_s390.h rename to urcu/arch/s390.h index 1f03c78..5985b20 100644 --- a/urcu/arch_s390.h +++ b/urcu/arch/s390.h @@ -54,6 +54,6 @@ static inline cycles_t caa_get_cycles (void) } #endif -#include +#include #endif /* _URCU_ARCH_S390_H */ diff --git a/urcu/arch_sparc64.h b/urcu/arch/sparc64.h similarity index 98% rename from urcu/arch_sparc64.h rename to urcu/arch/sparc64.h index 283a8f4..46e2665 100644 --- a/urcu/arch_sparc64.h +++ b/urcu/arch/sparc64.h @@ -55,6 +55,6 @@ static inline cycles_t caa_get_cycles (void) } #endif -#include +#include #endif /* _URCU_ARCH_SPARC64_H */ diff --git a/urcu/arch_unknown.h b/urcu/arch/unknown.h similarity index 100% rename from urcu/arch_unknown.h rename to urcu/arch/unknown.h diff --git a/urcu/arch_x86.h b/urcu/arch/x86.h similarity index 98% rename from urcu/arch_x86.h rename to urcu/arch/x86.h index 20db5cf..9e5411f 100644 --- a/urcu/arch_x86.h +++ b/urcu/arch/x86.h @@ -69,6 +69,6 @@ static inline cycles_t caa_get_cycles(void) } #endif -#include +#include #endif /* _URCU_ARCH_X86_H */ -- 2.34.1