From 9bc28528bba4f38ddeefb1affe9ebd42721c6292 Mon Sep 17 00:00:00 2001
From: Pierre Blanchard <pierre.blanchard@arm.com>
Date: Fri, 25 Oct 2024 07:29:26 +0000
Subject: [PATCH] Fix up native gcc toolchain file

And complete other toolchain file.
---
 toolchains/aarch64-gcc.cmake |  2 ++
 toolchains/armhf-gcc.cmake   |  2 ++
 toolchains/native-gcc.cmake  | 11 ++++++++++-
 toolchains/ppc64el-gcc.cmake |  7 ++++++-
 toolchains/s390x-gcc.cmake   |  4 ++++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/toolchains/aarch64-gcc.cmake b/toolchains/aarch64-gcc.cmake
index ef5be569..89f309d2 100644
--- a/toolchains/aarch64-gcc.cmake
+++ b/toolchains/aarch64-gcc.cmake
@@ -7,6 +7,8 @@ SET(CMAKE_FIND_ROOT_PATH  /usr/aarch64-linux-gnu /usr/include/aarch64-linux-gnu
 find_program(CMAKE_C_COMPILER
              NAMES aarch64-linux-gnu-gcc-12
                    aarch64-linux-gnu-gcc-11
+                   aarch64-linux-gnu-gcc-10
+                   aarch64-linux-gnu-gcc-9
                    aarch64-linux-gnu-gcc-8
                    aarch64-linux-gnu-gcc-7
                    aarch64-linux-gnu-gcc-6
diff --git a/toolchains/armhf-gcc.cmake b/toolchains/armhf-gcc.cmake
index 013485df..2e4e538d 100644
--- a/toolchains/armhf-gcc.cmake
+++ b/toolchains/armhf-gcc.cmake
@@ -7,6 +7,8 @@ SET(CMAKE_FIND_ROOT_PATH  /usr/arm-linux-gnueabihf /usr/include/arm-linux-gnueab
 find_program(CMAKE_C_COMPILER
              NAMES arm-linux-gnueabihf-gcc-12
                    arm-linux-gnueabihf-gcc-11
+                   arm-linux-gnueabihf-gcc-10
+                   arm-linux-gnueabihf-gcc-9
                    arm-linux-gnueabihf-gcc-8
                    arm-linux-gnueabihf-gcc-7
                    arm-linux-gnueabihf-gcc-6
diff --git a/toolchains/native-gcc.cmake b/toolchains/native-gcc.cmake
index 07ea294d..e78e78e7 100644
--- a/toolchains/native-gcc.cmake
+++ b/toolchains/native-gcc.cmake
@@ -1 +1,10 @@
-find_program(CMAKE_C_COMPILER gcc)
+find_program(CMAKE_C_COMPILER
+             NAMES gcc-12
+                   gcc-11
+                   gcc-10
+                   gcc-9
+                   gcc-8
+                   gcc-7
+                   gcc-6
+                   gcc-5
+                   gcc)
diff --git a/toolchains/ppc64el-gcc.cmake b/toolchains/ppc64el-gcc.cmake
index c950aab7..34c619f0 100644
--- a/toolchains/ppc64el-gcc.cmake
+++ b/toolchains/ppc64el-gcc.cmake
@@ -7,7 +7,12 @@ SET(CMAKE_FIND_ROOT_PATH  /usr/powerpc64le-linux-gnu /usr/include/powerpc64le-li
 find_program(CMAKE_C_COMPILER
              NAMES powerpc64le-linux-gnu-gcc-12
                    powerpc64le-linux-gnu-gcc-11
-                   powerpc64le-linux-gnu-gcc
+                   powerpc64le-linux-gnu-gcc-10
+                   powerpc64le-linux-gnu-gcc-9
+                   powerpc64le-linux-gnu-gcc-8
+                   powerpc64le-linux-gnu-gcc-7
+                   powerpc64le-linux-gnu-gcc-6
+                   powerpc64le-linux-gnu-gcc-5
                    ppc64el-cc)
 
 SET(CMAKE_AR /usr/powerpc64le-linux-gnu/bin/ar)
diff --git a/toolchains/s390x-gcc.cmake b/toolchains/s390x-gcc.cmake
index f95ea5f8..fd2dd56a 100644
--- a/toolchains/s390x-gcc.cmake
+++ b/toolchains/s390x-gcc.cmake
@@ -7,6 +7,10 @@ SET(CMAKE_FIND_ROOT_PATH  /usr/s390x-linux-gnu /usr/include/s390x-linux-gnu /usr
 find_program(CMAKE_C_COMPILER
              NAMES s390x-linux-gnu-gcc-12
                    s390x-linux-gnu-gcc-11
+                   s390x-linux-gnu-gcc-10
+                   s390x-linux-gnu-gcc-9
+                   s390x-linux-gnu-gcc-8
+                   s390x-linux-gnu-gcc-7
                    s390x-linux-gnu-gcc)
 
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)