| Message ID | 1456184538-8632-1-git-send-email-anders.roxell@linaro.org |
|---|---|
| State | Accepted |
| Commit | caacba8d4f1fafe8ee86efdb1ed0799be7f10125 |
| Headers | show |
On 2016-02-23 00:42, Anders Roxell wrote: > Fix build error while building an application against ODP > /media/data/src/install-odp-api-next/include/odp/api/cpu.h:20:26: fatal > error: odp/cpu_arch.h: No such file or directory > #include <odp/cpu_arch.h> > > compilation terminated. > > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Reviewed-by: Christophe Milard <christophe.milard@linaro.org> > --- > platform/linux-generic/Makefile.am | 2 +- > platform/linux-generic/arch/linux/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/cpu.h | 2 +- > 6 files changed, 2 insertions(+), 2 deletions(-) > rename platform/linux-generic/arch/linux/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%) > > diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am > index 00c8ac9..d0e1641 100644 > --- a/platform/linux-generic/Makefile.am > +++ b/platform/linux-generic/Makefile.am > @@ -56,7 +56,7 @@ odpapiinclude_HEADERS = \ > $(srcdir)/include/odp/api/timer.h \ > $(srcdir)/include/odp/api/traffic_mngr.h \ > $(srcdir)/include/odp/api/version.h \ > - $(srcdir)/arch/@ARCH@/odp/cpu_arch.h > + $(srcdir)/arch/@ARCH@/odp/api/cpu_arch.h > > odpapiplatincludedir= $(includedir)/odp/api/plat > odpapiplatinclude_HEADERS = \ > diff --git a/platform/linux-generic/arch/linux/odp/cpu_arch.h b/platform/linux-generic/arch/linux/odp/api/cpu_arch.h > similarity index 100% > rename from platform/linux-generic/arch/linux/odp/cpu_arch.h > rename to platform/linux-generic/arch/linux/odp/api/cpu_arch.h > diff --git a/platform/linux-generic/arch/mips64/odp/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h > similarity index 100% > rename from platform/linux-generic/arch/mips64/odp/cpu_arch.h > rename to platform/linux-generic/arch/mips64/odp/api/cpu_arch.h > diff --git a/platform/linux-generic/arch/powerpc/odp/cpu_arch.h b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h > similarity index 100% > rename from platform/linux-generic/arch/powerpc/odp/cpu_arch.h > rename to platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h > diff --git a/platform/linux-generic/arch/x86/odp/cpu_arch.h b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h > similarity index 100% > rename from platform/linux-generic/arch/x86/odp/cpu_arch.h > rename to platform/linux-generic/arch/x86/odp/api/cpu_arch.h > diff --git a/platform/linux-generic/include/odp/api/cpu.h b/platform/linux-generic/include/odp/api/cpu.h > index e0bdc9e..d49c782 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/cpu_arch.h> > +#include <odp/api/cpu_arch.h> > > #include <odp/api/spec/cpu.h> > > -- > 2.1.4 >
Merged, with that change you probably need to change that naming: +#ifndef ODP_PLAT_CPU_ARCH_H_ +#define ODP_PLAT_CPU_ARCH_H_ to #ifndef ODP_API_CPU_ARCH_H_ or #ifndef ODP_API_PLAT_CPU_ARCH_H_ Maxim. On 02/23/16 11:48, Christophe Milard wrote: > On 2016-02-23 00:42, Anders Roxell wrote: >> Fix build error while building an application against ODP >> /media/data/src/install-odp-api-next/include/odp/api/cpu.h:20:26: fatal >> error: odp/cpu_arch.h: No such file or directory >> #include <odp/cpu_arch.h> >> >> compilation terminated. >> >> Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > Reviewed-by: Christophe Milard <christophe.milard@linaro.org> >> --- >> platform/linux-generic/Makefile.am | 2 +- >> platform/linux-generic/arch/linux/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/cpu.h | 2 +- >> 6 files changed, 2 insertions(+), 2 deletions(-) >> rename platform/linux-generic/arch/linux/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%) >> >> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am >> index 00c8ac9..d0e1641 100644 >> --- a/platform/linux-generic/Makefile.am >> +++ b/platform/linux-generic/Makefile.am >> @@ -56,7 +56,7 @@ odpapiinclude_HEADERS = \ >> $(srcdir)/include/odp/api/timer.h \ >> $(srcdir)/include/odp/api/traffic_mngr.h \ >> $(srcdir)/include/odp/api/version.h \ >> - $(srcdir)/arch/@ARCH@/odp/cpu_arch.h >> + $(srcdir)/arch/@ARCH@/odp/api/cpu_arch.h >> >> odpapiplatincludedir= $(includedir)/odp/api/plat >> odpapiplatinclude_HEADERS = \ >> diff --git a/platform/linux-generic/arch/linux/odp/cpu_arch.h b/platform/linux-generic/arch/linux/odp/api/cpu_arch.h >> similarity index 100% >> rename from platform/linux-generic/arch/linux/odp/cpu_arch.h >> rename to platform/linux-generic/arch/linux/odp/api/cpu_arch.h >> diff --git a/platform/linux-generic/arch/mips64/odp/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h >> similarity index 100% >> rename from platform/linux-generic/arch/mips64/odp/cpu_arch.h >> rename to platform/linux-generic/arch/mips64/odp/api/cpu_arch.h >> diff --git a/platform/linux-generic/arch/powerpc/odp/cpu_arch.h b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h >> similarity index 100% >> rename from platform/linux-generic/arch/powerpc/odp/cpu_arch.h >> rename to platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h >> diff --git a/platform/linux-generic/arch/x86/odp/cpu_arch.h b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h >> similarity index 100% >> rename from platform/linux-generic/arch/x86/odp/cpu_arch.h >> rename to platform/linux-generic/arch/x86/odp/api/cpu_arch.h >> diff --git a/platform/linux-generic/include/odp/api/cpu.h b/platform/linux-generic/include/odp/api/cpu.h >> index e0bdc9e..d49c782 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/cpu_arch.h> >> +#include <odp/api/cpu_arch.h> >> >> #include <odp/api/spec/cpu.h> >> >> -- >> 2.1.4 >> > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 00c8ac9..d0e1641 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -56,7 +56,7 @@ odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/timer.h \ $(srcdir)/include/odp/api/traffic_mngr.h \ $(srcdir)/include/odp/api/version.h \ - $(srcdir)/arch/@ARCH@/odp/cpu_arch.h + $(srcdir)/arch/@ARCH@/odp/api/cpu_arch.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ diff --git a/platform/linux-generic/arch/linux/odp/cpu_arch.h b/platform/linux-generic/arch/linux/odp/api/cpu_arch.h similarity index 100% rename from platform/linux-generic/arch/linux/odp/cpu_arch.h rename to platform/linux-generic/arch/linux/odp/api/cpu_arch.h diff --git a/platform/linux-generic/arch/mips64/odp/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h similarity index 100% rename from platform/linux-generic/arch/mips64/odp/cpu_arch.h rename to platform/linux-generic/arch/mips64/odp/api/cpu_arch.h diff --git a/platform/linux-generic/arch/powerpc/odp/cpu_arch.h b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h similarity index 100% rename from platform/linux-generic/arch/powerpc/odp/cpu_arch.h rename to platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h diff --git a/platform/linux-generic/arch/x86/odp/cpu_arch.h b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h similarity index 100% rename from platform/linux-generic/arch/x86/odp/cpu_arch.h rename to platform/linux-generic/arch/x86/odp/api/cpu_arch.h diff --git a/platform/linux-generic/include/odp/api/cpu.h b/platform/linux-generic/include/odp/api/cpu.h index e0bdc9e..d49c782 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/cpu_arch.h> +#include <odp/api/cpu_arch.h> #include <odp/api/spec/cpu.h>
Fix build error while building an application against ODP /media/data/src/install-odp-api-next/include/odp/api/cpu.h:20:26: fatal error: odp/cpu_arch.h: No such file or directory #include <odp/cpu_arch.h> compilation terminated. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- platform/linux-generic/Makefile.am | 2 +- platform/linux-generic/arch/linux/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/cpu.h | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) rename platform/linux-generic/arch/linux/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%)