[v3,06/12] linux-generic: add arch/arm

Message ID	20160726025625.7343-7-brian.brooks@linaro.org
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; From: Brian Brooks <brian.brooks@linaro.org> To: lng-odp@lists.linaro.org Date: Mon, 25 Jul 2016 21:56:19 -0500 Message-Id: <20160726025625.7343-7-brian.brooks@linaro.org> In-Reply-To: <20160726025625.7343-1-brian.brooks@linaro.org> References: <20160726025625.7343-1-brian.brooks@linaro.org> Subject: [lng-odp] [PATCH v3 06/12] linux-generic: add arch/arm Precedence: list Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>

Message ID

20160726025625.7343-7-brian.brooks@linaro.org

State

New

Headers

Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org
	designates 54.225.227.206 as permitted sender)
	client-ip=54.225.227.206; 
From: Brian Brooks <brian.brooks@linaro.org>
To: lng-odp@lists.linaro.org
Date: Mon, 25 Jul 2016 21:56:19 -0500
Message-Id: <20160726025625.7343-7-brian.brooks@linaro.org>
In-Reply-To: <20160726025625.7343-1-brian.brooks@linaro.org>
References: <20160726025625.7343-1-brian.brooks@linaro.org>
Subject: [lng-odp] [PATCH v3 06/12] linux-generic: add arch/arm
Precedence: list
Errors-To: lng-odp-bounces@lists.linaro.org
Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>

Commit Message

Brian Brooks July 26, 2016, 2:56 a.m. UTC

Signed-off-by: Brian Brooks <brian.brooks@linaro.org>

---
 configure.ac                                                 | 12 ++++++++++--
 platform/Makefile.inc                                        |  6 +++---
 platform/linux-generic/arch/{default => arm}/cpu_arch.h      |  0
 platform/linux-generic/arch/{default => arm}/odp_cpu_arch.c  |  0
 .../linux-generic/arch/{default => arm}/odp_sysinfo_parse.c  |  0
 5 files changed, 13 insertions(+), 5 deletions(-)
 rename platform/linux-generic/arch/{default => arm}/cpu_arch.h (100%)
 rename platform/linux-generic/arch/{default => arm}/odp_cpu_arch.c (100%)
 rename platform/linux-generic/arch/{default => arm}/odp_sysinfo_parse.c (100%)

-- 
2.9.0

Comments

Maxim Uvarov July 26, 2016, 7:51 a.m. UTC | #1

On 07/26/16 05:56, Brian Brooks wrote:
> Signed-off-by: Brian Brooks <brian.brooks@linaro.org>

> ---

>   configure.ac                                                 | 12 ++++++++++--

>   platform/Makefile.inc                                        |  6 +++---

>   platform/linux-generic/arch/{default => arm}/cpu_arch.h      |  0

>   platform/linux-generic/arch/{default => arm}/odp_cpu_arch.c  |  0

>   .../linux-generic/arch/{default => arm}/odp_sysinfo_parse.c  |  0

>   5 files changed, 13 insertions(+), 5 deletions(-)

>   rename platform/linux-generic/arch/{default => arm}/cpu_arch.h (100%)

>   rename platform/linux-generic/arch/{default => arm}/odp_cpu_arch.c (100%)

>   rename platform/linux-generic/arch/{default => arm}/odp_sysinfo_parse.c (100%)

>

> diff --git a/configure.ac b/configure.ac

> index a7e058a..a42918f 100644

> --- a/configure.ac

> +++ b/configure.ac

> @@ -70,17 +70,25 @@ CC_VERSION_PATCH=$(echo $CC_VERSION | cut -d'.' -f3)

>   AX_VALGRIND_CHECK

>   

>   ##########################################################################

> -# Which architecture optimizations will we use

> +# Select architecture

>   ##########################################################################

>   AS_CASE([$host],

> +  [arm*], [ARCH_DIR=arm],

> +  [aarch64*], [ARCH_DIR=arm],

>     [x86*], [ARCH_DIR=x86],

>     [i686*], [ARCH_DIR=x86],

>     [mips64*], [ARCH_DIR=mips64],

>     [powerpc*], [ARCH_DIR=powerpc],

> -  [ARCH_DIR=default]

> +  [ARCH_DIR=undefined]


patch 3 changes undefined to default, current patch 6 changes it back, 
that looks not good.

Maxim.


>   )

>   AC_SUBST([ARCH_DIR])

>   

> +if test "${ARCH_DIR}" == "undefined";

> +then

> +    echo "ARCH_DIR is undefined, please add support for host=${host}"

> +    exit 1

> +fi

> +

>   ##########################################################################

>   # Set correct pkgconfig version

>   ##########################################################################

> diff --git a/platform/Makefile.inc b/platform/Makefile.inc

> index e20bd3e..b45c955 100644

> --- a/platform/Makefile.inc

> +++ b/platform/Makefile.inc

> @@ -62,9 +62,9 @@ odpapispecinclude_HEADERS = \

>   		  $(top_srcdir)/include/odp/api/spec/version.h

>   

>   EXTRA_DIST = \

> -	     arch/default/cpu_arch.h \

> -	     arch/default/odp_cpu_arch.c \

> -	     arch/default/odp_sysinfo_parse.c \

> +	     arch/arm/cpu_arch.h \

> +	     arch/arm/odp_cpu_arch.c \

> +	     arch/arm/odp_sysinfo_parse.c \

>   	     arch/mips64/cpu_arch.h \

>   	     arch/mips64/odp_cpu_arch.c \

>   	     arch/mips64/odp_sysinfo_parse.c \

> diff --git a/platform/linux-generic/arch/default/cpu_arch.h b/platform/linux-generic/arch/arm/cpu_arch.h

> similarity index 100%

> rename from platform/linux-generic/arch/default/cpu_arch.h

> rename to platform/linux-generic/arch/arm/cpu_arch.h

> diff --git a/platform/linux-generic/arch/default/odp_cpu_arch.c b/platform/linux-generic/arch/arm/odp_cpu_arch.c

> similarity index 100%

> rename from platform/linux-generic/arch/default/odp_cpu_arch.c

> rename to platform/linux-generic/arch/arm/odp_cpu_arch.c

> diff --git a/platform/linux-generic/arch/default/odp_sysinfo_parse.c b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c

> similarity index 100%

> rename from platform/linux-generic/arch/default/odp_sysinfo_parse.c

> rename to platform/linux-generic/arch/arm/odp_sysinfo_parse.c

Brian Brooks July 26, 2016, 5:32 p.m. UTC | #2

On 07/26 10:51:56, Maxim Uvarov wrote:
> On 07/26/16 05:56, Brian Brooks wrote:

> > Signed-off-by: Brian Brooks <brian.brooks@linaro.org>

> > ---

> >   configure.ac                                                 | 12 ++++++++++--

> >   platform/Makefile.inc                                        |  6 +++---

> >   platform/linux-generic/arch/{default => arm}/cpu_arch.h      |  0

> >   platform/linux-generic/arch/{default => arm}/odp_cpu_arch.c  |  0

> >   .../linux-generic/arch/{default => arm}/odp_sysinfo_parse.c  |  0

> >   5 files changed, 13 insertions(+), 5 deletions(-)

> >   rename platform/linux-generic/arch/{default => arm}/cpu_arch.h (100%)

> >   rename platform/linux-generic/arch/{default => arm}/odp_cpu_arch.c (100%)

> >   rename platform/linux-generic/arch/{default => arm}/odp_sysinfo_parse.c (100%)

> > 

> > diff --git a/configure.ac b/configure.ac

> > index a7e058a..a42918f 100644

> > --- a/configure.ac

> > +++ b/configure.ac

> > @@ -70,17 +70,25 @@ CC_VERSION_PATCH=$(echo $CC_VERSION | cut -d'.' -f3)

> >   AX_VALGRIND_CHECK

> >   ##########################################################################

> > -# Which architecture optimizations will we use

> > +# Select architecture

> >   ##########################################################################

> >   AS_CASE([$host],

> > +  [arm*], [ARCH_DIR=arm],

> > +  [aarch64*], [ARCH_DIR=arm],

> >     [x86*], [ARCH_DIR=x86],

> >     [i686*], [ARCH_DIR=x86],

> >     [mips64*], [ARCH_DIR=mips64],

> >     [powerpc*], [ARCH_DIR=powerpc],

> > -  [ARCH_DIR=default]

> > +  [ARCH_DIR=undefined]

> 

> patch 3 changes undefined to default, current patch 6 changes it back, that

> looks not good.

> 

> Maxim.


You seem to understand it though. I didn't think this would be the case if
trying to remove the use of symbolic links while adding real code in the
same spot while removing the dummy default target. These patches break that
up into separate steps while attempting to keep the build working across
all targets.

> >   )

> >   AC_SUBST([ARCH_DIR])

> > +if test "${ARCH_DIR}" == "undefined";

> > +then

> > +    echo "ARCH_DIR is undefined, please add support for host=${host}"

> > +    exit 1

> > +fi

> > +

> >   ##########################################################################

> >   # Set correct pkgconfig version

> >   ##########################################################################

> > diff --git a/platform/Makefile.inc b/platform/Makefile.inc

> > index e20bd3e..b45c955 100644

> > --- a/platform/Makefile.inc

> > +++ b/platform/Makefile.inc

> > @@ -62,9 +62,9 @@ odpapispecinclude_HEADERS = \

> >   		  $(top_srcdir)/include/odp/api/spec/version.h

> >   EXTRA_DIST = \

> > -	     arch/default/cpu_arch.h \

> > -	     arch/default/odp_cpu_arch.c \

> > -	     arch/default/odp_sysinfo_parse.c \

> > +	     arch/arm/cpu_arch.h \

> > +	     arch/arm/odp_cpu_arch.c \

> > +	     arch/arm/odp_sysinfo_parse.c \

> >   	     arch/mips64/cpu_arch.h \

> >   	     arch/mips64/odp_cpu_arch.c \

> >   	     arch/mips64/odp_sysinfo_parse.c \

> > diff --git a/platform/linux-generic/arch/default/cpu_arch.h b/platform/linux-generic/arch/arm/cpu_arch.h

> > similarity index 100%

> > rename from platform/linux-generic/arch/default/cpu_arch.h

> > rename to platform/linux-generic/arch/arm/cpu_arch.h

> > diff --git a/platform/linux-generic/arch/default/odp_cpu_arch.c b/platform/linux-generic/arch/arm/odp_cpu_arch.c

> > similarity index 100%

> > rename from platform/linux-generic/arch/default/odp_cpu_arch.c

> > rename to platform/linux-generic/arch/arm/odp_cpu_arch.c

> > diff --git a/platform/linux-generic/arch/default/odp_sysinfo_parse.c b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c

> > similarity index 100%

> > rename from platform/linux-generic/arch/default/odp_sysinfo_parse.c

> > rename to platform/linux-generic/arch/arm/odp_sysinfo_parse.c

>

diff --git a/configure.ac b/configure.ac
index a7e058a..a42918f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,17 +70,25 @@  CC_VERSION_PATCH=$(echo $CC_VERSION | cut -d'.' -f3)
 AX_VALGRIND_CHECK
 
 ##########################################################################
-# Which architecture optimizations will we use
+# Select architecture
 ##########################################################################
 AS_CASE([$host],
+  [arm*], [ARCH_DIR=arm],
+  [aarch64*], [ARCH_DIR=arm],
   [x86*], [ARCH_DIR=x86],
   [i686*], [ARCH_DIR=x86],
   [mips64*], [ARCH_DIR=mips64],
   [powerpc*], [ARCH_DIR=powerpc],
-  [ARCH_DIR=default]
+  [ARCH_DIR=undefined]
 )
 AC_SUBST([ARCH_DIR])
 
+if test "${ARCH_DIR}" == "undefined";
+then
+    echo "ARCH_DIR is undefined, please add support for host=${host}"
+    exit 1
+fi
+
 ##########################################################################
 # Set correct pkgconfig version
 ##########################################################################
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index e20bd3e..b45c955 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -62,9 +62,9 @@  odpapispecinclude_HEADERS = \
 		  $(top_srcdir)/include/odp/api/spec/version.h
 
 EXTRA_DIST = \
-	     arch/default/cpu_arch.h \
-	     arch/default/odp_cpu_arch.c \
-	     arch/default/odp_sysinfo_parse.c \
+	     arch/arm/cpu_arch.h \
+	     arch/arm/odp_cpu_arch.c \
+	     arch/arm/odp_sysinfo_parse.c \
 	     arch/mips64/cpu_arch.h \
 	     arch/mips64/odp_cpu_arch.c \
 	     arch/mips64/odp_sysinfo_parse.c \
diff --git a/platform/linux-generic/arch/default/cpu_arch.h b/platform/linux-generic/arch/arm/cpu_arch.h
similarity index 100%
rename from platform/linux-generic/arch/default/cpu_arch.h
rename to platform/linux-generic/arch/arm/cpu_arch.h
diff --git a/platform/linux-generic/arch/default/odp_cpu_arch.c b/platform/linux-generic/arch/arm/odp_cpu_arch.c
similarity index 100%
rename from platform/linux-generic/arch/default/odp_cpu_arch.c
rename to platform/linux-generic/arch/arm/odp_cpu_arch.c
diff --git a/platform/linux-generic/arch/default/odp_sysinfo_parse.c b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c
similarity index 100%
rename from platform/linux-generic/arch/default/odp_sysinfo_parse.c
rename to platform/linux-generic/arch/arm/odp_sysinfo_parse.c

[v3,06/12] linux-generic: add arch/arm

Commit Message

Comments

Patch