diff --git a/base/comps/components.toml b/base/comps/components.toml
index 42426ab775a..90833b9c56e 100644
--- a/base/comps/components.toml
+++ b/base/comps/components.toml
@@ -2063,7 +2063,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml"]
 [components.llhttp]
 [components.llvm15]
 [components.llvm18]
-[components.llvm20]
 [components.lm_sensors]
 [components.lmdb]
 [components.lockdev]
diff --git a/base/comps/llvm/llvm.comp.toml b/base/comps/llvm/llvm.comp.toml
index 4d1a32020fe..486add6792e 100644
--- a/base/comps/llvm/llvm.comp.toml
+++ b/base/comps/llvm/llvm.comp.toml
@@ -4,3 +4,9 @@
 # are imported into Azure Linux. MLIR is gated on %{with mlir} in the
 # upstream spec and pulls in python3-nanobind-devel which doesn't exist yet.
 build.without = ["mlir"]
+
+[[components.llvm.overlays]]
+description = "Use the Azure Linux GCC toolchain triple in clang's default config so clang can find gcc runtime files in stage2 builds"
+type = "spec-search-replace"
+regex = '%global cfg_file_content --gcc-triple=%{_target_cpu}-redhat-linux'
+replacement = '%global cfg_file_content --gcc-triple=%{_target_cpu}-azurelinux-linux'
diff --git a/base/comps/llvm20/llvm20.comp.toml b/base/comps/llvm20/llvm20.comp.toml
new file mode 100644
index 00000000000..a6b4a65aed5
--- /dev/null
+++ b/base/comps/llvm20/llvm20.comp.toml
@@ -0,0 +1,7 @@
+[components.llvm20]
+
+[[components.llvm20.overlays]]
+description = "Use the Azure Linux GCC toolchain triple in clang20's default config so clang20 can find gcc runtime files in stage2 builds"
+type = "spec-search-replace"
+regex = '%global cfg_file_content --gcc-triple=%{_target_cpu}-redhat-linux'
+replacement = '%global cfg_file_content --gcc-triple=%{_target_cpu}-azurelinux-linux'
diff --git a/locks/llvm.lock b/locks/llvm.lock
index 3f4bea02899..6d7ed1ffa04 100644
--- a/locks/llvm.lock
+++ b/locks/llvm.lock
@@ -2,5 +2,5 @@
 version = 1
 import-commit = '659c0740e5c29098632207467aa89ce0083d5892'
 upstream-commit = '659c0740e5c29098632207467aa89ce0083d5892'
-input-fingerprint = 'sha256:22b9f82e2af24b7f06d921f74ac4b076e3ede06d26b66233acaad35a36c342c3'
+input-fingerprint = 'sha256:ee89ed5c6013a58c3983ae38af409ce4b53dc6dea3a35e7b666f45f36357c439'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
diff --git a/locks/llvm20.lock b/locks/llvm20.lock
index f1e76b6fbea..27d6fa502ee 100644
--- a/locks/llvm20.lock
+++ b/locks/llvm20.lock
@@ -2,5 +2,5 @@
 version = 1
 import-commit = '2cecf3d98071e54a6bfc29d9656698c89a07a535'
 upstream-commit = '2cecf3d98071e54a6bfc29d9656698c89a07a535'
-input-fingerprint = 'sha256:b355b2d8889f156e6c50ccad53ade7e9a6c133e333aeade2921c2291d3e56859'
+input-fingerprint = 'sha256:9b2dd4bc6ea4bc46970139d1fe924f2cc18b1c46480ba47c94ca28dc1665bac7'
 resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
diff --git a/specs/l/llvm/llvm.spec b/specs/l/llvm/llvm.spec
index 3c41ae5d8ea..a15672e01a3 100644
--- a/specs/l/llvm/llvm.spec
+++ b/specs/l/llvm/llvm.spec
@@ -2,7 +2,7 @@
 ## (rpmautospec version 0.8.3)
 ## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 5;
+    release_number = 6;
     base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
     print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
@@ -1310,7 +1310,7 @@ sed -i 's/LLDB_ENABLE_PYTHON/TRUE/' lldb/docs/CMakeLists.txt
 %global runtimes %{runtimes};offload
 %endif
 
-%global cfg_file_content --gcc-triple=%{_target_cpu}-redhat-linux
+%global cfg_file_content --gcc-triple=%{_target_cpu}-azurelinux-linux
 
 # We want to use DWARF-5 on all snapshot builds.
 %if %{without snapshot_build} && %{defined rhel} && 0%{?rhel} < 10
@@ -3514,6 +3514,9 @@ fi
 
 %changelog
 ## START: Generated by rpmautospec
+* Fri May 01 2026 Rachel Menge <rachelmenge@microsoft.com> - 21.1.8-6
+- fix(llvm): correct clang's default GCC triple for Azure Linux stage2
+
 * Thu Apr 30 2026 Daniel McIlvaney <damcilva@microsoft.com> - 21.1.8-5
 - feat: introduce deterministic commit resolution via Azure Linux lock file
 
diff --git a/specs/l/llvm20/llvm20.spec b/specs/l/llvm20/llvm20.spec
index a9f12c738e5..a3f01c45e13 100644
--- a/specs/l/llvm20/llvm20.spec
+++ b/specs/l/llvm20/llvm20.spec
@@ -1302,7 +1302,7 @@ sed -i 's/LLDB_ENABLE_PYTHON/TRUE/' lldb/docs/CMakeLists.txt
 %global runtimes %{runtimes};offload
 %endif
 
-%global cfg_file_content --gcc-triple=%{_target_cpu}-redhat-linux
+%global cfg_file_content --gcc-triple=%{_target_cpu}-azurelinux-linux
 
 # We want to use DWARF-5 on all snapshot builds.
 %if %{without snapshot_build} && %{defined rhel} && 0%{?rhel} < 10