From 6abe16c3fb1445d43fc2f5919fd7dfe6b074d388 Mon Sep 17 00:00:00 2001
From: WizzardSK <wizzardsk@gmail.com>
Date: Fri, 24 Jul 2026 19:55:15 +0200
Subject: [PATCH 1/2] ci: add Linux aarch64 libretro build

---
 .gitlab-ci.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db367f58b9b6..37b7d569446d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,11 @@ include:
   # Linux 64-bit
   - project: 'libretro-infrastructure/ci-templates'
     file: '/linux-cmake.yml'
-    
+
+  # Linux ARM 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/linux-cmake-aarch64.yml'
+
   # MacOS x64
   - project: 'libretro-infrastructure/ci-templates'
     file: 'osx-cmake-x86.yml'
@@ -76,6 +80,18 @@ libretro-build-linux-x64:
     CC: /usr/bin/gcc-12
     CXX: /usr/bin/g++-12
 
+# Linux ARM 64-bit
+libretro-build-linux-aarch64:
+  extends:
+    - .libretro-linux-cmake-aarch64
+    - .core-defs
+  # Same as the x64 job: the default image's GCC is too old for this core's
+  # C++ usage, so use the backports image and GCC 12.
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-aarch64-ubuntu:backports
+  variables:
+    CC: /usr/bin/gcc-12
+    CXX: /usr/bin/g++-12
+
 # macOS Intel
 libretro-build-osx-x64:
   tags:

From 6c3c3747ec98171110745a764e089d57d6ca7da8 Mon Sep 17 00:00:00 2001
From: WizzardSK <wizzardsk@gmail.com>
Date: Fri, 24 Jul 2026 19:57:42 +0200
Subject: [PATCH 2/2] ci: use aarch64 cmake class from linux-cmake.yml (no
 separate include)

---
 .gitlab-ci.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37b7d569446d..f28f9b78b20c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,10 +22,6 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/linux-cmake.yml'
 
-  # Linux ARM 64-bit
-  - project: 'libretro-infrastructure/ci-templates'
-    file: '/linux-cmake-aarch64.yml'
-
   # MacOS x64
   - project: 'libretro-infrastructure/ci-templates'
     file: 'osx-cmake-x86.yml'
@@ -85,9 +81,9 @@ libretro-build-linux-aarch64:
   extends:
     - .libretro-linux-cmake-aarch64
     - .core-defs
-  # Same as the x64 job: the default image's GCC is too old for this core's
-  # C++ usage, so use the backports image and GCC 12.
-  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-aarch64-ubuntu:backports
+  # No image override: unlike the x64 image, the aarch64 one already ships GCC 12
+  # (from ppa:ubuntu-toolchain-r/test in its Dockerfile), and it has no
+  # :backports tag at all.
   variables:
     CC: /usr/bin/gcc-12
     CXX: /usr/bin/g++-12