| Message ID | 1405507489-10129-1-git-send-email-ankit.jindal@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 2014-07-16 16:14, Ankit Jindal wrote: > This patch mainly fixes compilation error by adding __aarch64__ > in related headers. > > Signed-off-by: Ankit Jindal <ankit.jindal@linaro.org> > Signed-off-by: Tushar Jagad <tushar.jagad@linaro.org> Reviewed-by: Anders Roxell <anders.roxell@linaro.org> > --- > include/odp_align.h | 2 +- > platform/linux-generic/odp_system_info.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/odp_align.h b/include/odp_align.h > index 83495a8..5ee61be 100644 > --- a/include/odp_align.h > +++ b/include/odp_align.h > @@ -48,7 +48,7 @@ extern "C" { > /** Cache line size */ > #define ODP_CACHE_LINE_SIZE 64 > > -#elif defined __arm__ > +#elif defined __arm__ || defined __aarch64__ > > /** Cache line size */ > #define ODP_CACHE_LINE_SIZE 64 > diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c > index f78b746..10665bb 100644 > --- a/platform/linux-generic/odp_system_info.c > +++ b/platform/linux-generic/odp_system_info.c > @@ -160,7 +160,7 @@ static int cpuinfo_x86(FILE *file, odp_system_info_t *sysinfo) > return 0; > } > > -#elif defined __arm__ > +#elif defined __arm__ || defined __aarch64__ > > static int cpuinfo_arm(FILE *file ODP_UNUSED, > odp_system_info_t *sysinfo ODP_UNUSED) > @@ -259,7 +259,7 @@ static odp_compiler_info_t compiler_info = { > .cpu_arch_str = "x86", > .cpuinfo_parser = cpuinfo_x86 > > - #elif defined __arm__ > + #elif defined __arm__ || defined __aarch64__ > .cpu_arch_str = "arm", > .cpuinfo_parser = cpuinfo_arm > > -- > 1.7.9.5 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp
Applied, thanks! Maxim. On 07/16/2014 02:44 PM, Ankit Jindal wrote: > This patch mainly fixes compilation error by adding __aarch64__ > in related headers. > > Signed-off-by: Ankit Jindal <ankit.jindal@linaro.org> > Signed-off-by: Tushar Jagad <tushar.jagad@linaro.org> > --- > include/odp_align.h | 2 +- > platform/linux-generic/odp_system_info.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/odp_align.h b/include/odp_align.h > index 83495a8..5ee61be 100644 > --- a/include/odp_align.h > +++ b/include/odp_align.h > @@ -48,7 +48,7 @@ extern "C" { > /** Cache line size */ > #define ODP_CACHE_LINE_SIZE 64 > > -#elif defined __arm__ > +#elif defined __arm__ || defined __aarch64__ > > /** Cache line size */ > #define ODP_CACHE_LINE_SIZE 64 > diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c > index f78b746..10665bb 100644 > --- a/platform/linux-generic/odp_system_info.c > +++ b/platform/linux-generic/odp_system_info.c > @@ -160,7 +160,7 @@ static int cpuinfo_x86(FILE *file, odp_system_info_t *sysinfo) > return 0; > } > > -#elif defined __arm__ > +#elif defined __arm__ || defined __aarch64__ > > static int cpuinfo_arm(FILE *file ODP_UNUSED, > odp_system_info_t *sysinfo ODP_UNUSED) > @@ -259,7 +259,7 @@ static odp_compiler_info_t compiler_info = { > .cpu_arch_str = "x86", > .cpuinfo_parser = cpuinfo_x86 > > - #elif defined __arm__ > + #elif defined __arm__ || defined __aarch64__ > .cpu_arch_str = "arm", > .cpuinfo_parser = cpuinfo_arm >
diff --git a/include/odp_align.h b/include/odp_align.h index 83495a8..5ee61be 100644 --- a/include/odp_align.h +++ b/include/odp_align.h @@ -48,7 +48,7 @@ extern "C" { /** Cache line size */ #define ODP_CACHE_LINE_SIZE 64 -#elif defined __arm__ +#elif defined __arm__ || defined __aarch64__ /** Cache line size */ #define ODP_CACHE_LINE_SIZE 64 diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index f78b746..10665bb 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -160,7 +160,7 @@ static int cpuinfo_x86(FILE *file, odp_system_info_t *sysinfo) return 0; } -#elif defined __arm__ +#elif defined __arm__ || defined __aarch64__ static int cpuinfo_arm(FILE *file ODP_UNUSED, odp_system_info_t *sysinfo ODP_UNUSED) @@ -259,7 +259,7 @@ static odp_compiler_info_t compiler_info = { .cpu_arch_str = "x86", .cpuinfo_parser = cpuinfo_x86 - #elif defined __arm__ + #elif defined __arm__ || defined __aarch64__ .cpu_arch_str = "arm", .cpuinfo_parser = cpuinfo_arm