diff mbox

[v2,3/6] linux-generic: move cpu_arch.h up two directories

Message ID 20160804193006.99010-3-brian.brooks@linaro.org
State New
Headers show

Commit Message

Brian Brooks Aug. 4, 2016, 7:30 p.m. UTC 
Signed-off-by: Brian Brooks <brian.brooks@linaro.org>

---
 platform/Makefile.inc                                        | 8 ++++----
 platform/linux-generic/Makefile.am                           | 2 +-
 platform/linux-generic/arch/default/{odp/api => }/cpu_arch.h | 0
 platform/linux-generic/arch/mips64/{odp/api => }/cpu_arch.h  | 0
 platform/linux-generic/arch/powerpc/{odp/api => }/cpu_arch.h | 0
 platform/linux-generic/arch/x86/{odp/api => }/cpu_arch.h     | 0
 platform/linux-generic/include/odp/api/align.h               | 2 +-
 platform/linux-generic/include/odp/api/cpu.h                 | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename platform/linux-generic/arch/default/{odp/api => }/cpu_arch.h (100%)
 rename platform/linux-generic/arch/mips64/{odp/api => }/cpu_arch.h (100%)
 rename platform/linux-generic/arch/powerpc/{odp/api => }/cpu_arch.h (100%)
 rename platform/linux-generic/arch/x86/{odp/api => }/cpu_arch.h (100%)

-- 
2.9.2
diff mbox

Patch

diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 2a4255c..e20bd3e 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -62,15 +62,15 @@  odpapispecinclude_HEADERS = \
 		  $(top_srcdir)/include/odp/api/spec/version.h
 
 EXTRA_DIST = \
-	     arch/default/odp/api/cpu_arch.h \
+	     arch/default/cpu_arch.h \
 	     arch/default/odp_cpu_arch.c \
 	     arch/default/odp_sysinfo_parse.c \
-	     arch/mips64/odp/api/cpu_arch.h \
+	     arch/mips64/cpu_arch.h \
 	     arch/mips64/odp_cpu_arch.c \
 	     arch/mips64/odp_sysinfo_parse.c \
-	     arch/powerpc/odp/api/cpu_arch.h \
+	     arch/powerpc/cpu_arch.h \
 	     arch/powerpc/odp_cpu_arch.c \
 	     arch/powerpc/odp_sysinfo_parse.c \
-	     arch/x86/odp/api/cpu_arch.h \
+	     arch/x86/cpu_arch.h \
 	     arch/x86/odp_cpu_arch.c \
 	     arch/x86/odp_sysinfo_parse.c
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 0cfd0fe..8dc2764 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -56,7 +56,7 @@  odpapiinclude_HEADERS = \
 		  $(srcdir)/include/odp/api/version.h \
 		  $(srcdir)/include/odp/api/visibility_begin.h \
 		  $(srcdir)/include/odp/api/visibility_end.h \
-		  $(srcdir)/arch/@ARCH_DIR@/odp/api/cpu_arch.h
+		  $(srcdir)/arch/@ARCH_DIR@/cpu_arch.h
 
 odpapiplatincludedir= $(includedir)/odp/api/plat
 odpapiplatinclude_HEADERS = \
diff --git a/platform/linux-generic/arch/default/odp/api/cpu_arch.h b/platform/linux-generic/arch/default/cpu_arch.h
similarity index 100%
rename from platform/linux-generic/arch/default/odp/api/cpu_arch.h
rename to platform/linux-generic/arch/default/cpu_arch.h
diff --git a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h b/platform/linux-generic/arch/mips64/cpu_arch.h
similarity index 100%
rename from platform/linux-generic/arch/mips64/odp/api/cpu_arch.h
rename to platform/linux-generic/arch/mips64/cpu_arch.h
diff --git a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h b/platform/linux-generic/arch/powerpc/cpu_arch.h
similarity index 100%
rename from platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h
rename to platform/linux-generic/arch/powerpc/cpu_arch.h
diff --git a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h b/platform/linux-generic/arch/x86/cpu_arch.h
similarity index 100%
rename from platform/linux-generic/arch/x86/odp/api/cpu_arch.h
rename to platform/linux-generic/arch/x86/cpu_arch.h
diff --git a/platform/linux-generic/include/odp/api/align.h b/platform/linux-generic/include/odp/api/align.h
index c238b80..9aa9f37 100644
--- a/platform/linux-generic/include/odp/api/align.h
+++ b/platform/linux-generic/include/odp/api/align.h
@@ -17,7 +17,7 @@ 
 extern "C" {
 #endif
 
-#include <odp/api/cpu_arch.h>
+#include "cpu_arch.h"
 
 /** @ingroup odp_compiler_optim
  *  @{
diff --git a/platform/linux-generic/include/odp/api/cpu.h b/platform/linux-generic/include/odp/api/cpu.h
index ae04769..4585d35 100644
--- a/platform/linux-generic/include/odp/api/cpu.h
+++ b/platform/linux-generic/include/odp/api/cpu.h
@@ -17,7 +17,7 @@ 
 extern "C" {
 #endif
 
-#include <odp/api/cpu_arch.h>
+#include "cpu_arch.h"
 
 static inline void odp_cpu_pause(void)
 {