[PATCH 1/2] kas: rename armgcc fragment to avoid conflicting with musl

[PATCH 1/2] kas: rename armgcc fragment to avoid conflicting with musl

[Ross Burton]

The armgcc fragment was labelled 'libc', which means it would be
impossible to armgcc+musl.

Change-Id: I96f1d6e1a77bcd05fe373315f575c57c36417852
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 kas/armgcc.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kas/armgcc.yml b/kas/armgcc.yml
index 52b09b0..4e05f5e 100644
--- a/kas/armgcc.yml
+++ b/kas/armgcc.yml
@@ -2,5 +2,5 @@ header:
   version: 9
 
 local_conf_header:
-  libc: |
+  cc: |
     GCCVERSION = "arm-10.2"
-- 
2.25.1

[PATCH 2/2] kas: add a test for the external toolchain support

[Ross Burton]

meta-arm-toolchain supports using an external binary arm
toolchain[1] instead of the gcc-cross built by oe-core.

Add a test case to exercise this build in the CI.  Currently this
is only for the Aarch32 target as our CI runs on aarch64 and there
is no binary or aarch64 target on aarch64 host.

This depends on the image used by the CI having the relevant
compilers installed into /usr/local.

[1] https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a

Change-Id: I9f7ea66786e98a40cbd490386497e2d3aaa47e80
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .gitlab-ci.yml             | 3 +++
 kas/external-gcc-arm32.yml | 8 ++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 kas/external-gcc-arm32.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ae0aa3..f67e8b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,6 +69,9 @@ fvp-base:
 fvp-base-arm32:
   extends: .build
 
+fvp-base-arm32/external-gcc-arm32:
+  extends: .build
+
 gem5-arm64:
   extends: .build
 
diff --git a/kas/external-gcc-arm32.yml b/kas/external-gcc-arm32.yml
new file mode 100644
index 0000000..de8798e
--- /dev/null
+++ b/kas/external-gcc-arm32.yml
@@ -0,0 +1,8 @@
+header:
+  version: 9
+
+local_conf_header:
+  cc: |
+    PNBLACKLIST[gcc-cross-arm] = "Using external toolchain"
+    TCMODE = "external-arm"
+    EXTERNAL_TOOLCHAIN = "/usr/local/gcc-arm-10.2-2020.11-aarch64-arm-none-linux-gnueabihf"
-- 
2.25.1

Re: [meta-arm] [PATCH 2/2] kas: add a test for the external toolchain support

[Sumit Garg]

On Tue, 12 Jan 2021 at 16:39, Ross Burton <ross@burtonini.com> wrote:
>
> meta-arm-toolchain supports using an external binary arm
> toolchain[1] instead of the gcc-cross built by oe-core.
>
> Add a test case to exercise this build in the CI.  Currently this
> is only for the Aarch32 target as our CI runs on aarch64 and there
> is no binary or aarch64 target on aarch64 host.
>
> This depends on the image used by the CI having the relevant
> compilers installed into /usr/local.
>
> [1] https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a
>
> Change-Id: I9f7ea66786e98a40cbd490386497e2d3aaa47e80
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  .gitlab-ci.yml             | 3 +++
>  kas/external-gcc-arm32.yml | 8 ++++++++
>  2 files changed, 11 insertions(+)
>  create mode 100644 kas/external-gcc-arm32.yml
>

Thanks for setting up CI for external-arm-toolchain as well.

Acked-by: Sumit Garg <sumit.garg@linaro.org>

-Sumit

> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 3ae0aa3..f67e8b8 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -69,6 +69,9 @@ fvp-base:
>  fvp-base-arm32:
>    extends: .build
>
> +fvp-base-arm32/external-gcc-arm32:
> +  extends: .build
> +
>  gem5-arm64:
>    extends: .build
>
> diff --git a/kas/external-gcc-arm32.yml b/kas/external-gcc-arm32.yml
> new file mode 100644
> index 0000000..de8798e
> --- /dev/null
> +++ b/kas/external-gcc-arm32.yml
> @@ -0,0 +1,8 @@
> +header:
> +  version: 9
> +
> +local_conf_header:
> +  cc: |
> +    PNBLACKLIST[gcc-cross-arm] = "Using external toolchain"
> +    TCMODE = "external-arm"
> +    EXTERNAL_TOOLCHAIN = "/usr/local/gcc-arm-10.2-2020.11-aarch64-arm-none-linux-gnueabihf"
> --
> 2.25.1
>
>
> 
>

Re: [meta-arm] [PATCH 1/2] kas: rename armgcc fragment to avoid conflicting with musl

[Jon Mason]

On Tue, Jan 12, 2021 at 11:09:14AM +0000, Ross Burton wrote:
> The armgcc fragment was labelled 'libc', which means it would be
> impossible to armgcc+musl.
> 
> Change-Id: I96f1d6e1a77bcd05fe373315f575c57c36417852
> Signed-off-by: Ross Burton <ross.burton@arm.com>

Series pulled into master.

Thanks,
Jon

> ---
>  kas/armgcc.yml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kas/armgcc.yml b/kas/armgcc.yml
> index 52b09b0..4e05f5e 100644
> --- a/kas/armgcc.yml
> +++ b/kas/armgcc.yml
> @@ -2,5 +2,5 @@ header:
>    version: 9
>  
>  local_conf_header:
> -  libc: |
> +  cc: |
>      GCCVERSION = "arm-10.2"
> -- 
> 2.25.1
> 

> 
> 
>