diff --git a/toolchain/internal/llvm_distributions.bzl b/toolchain/internal/llvm_distributions.bzl
index 729fbabac..9ff304ab9 100644
--- a/toolchain/internal/llvm_distributions.bzl
+++ b/toolchain/internal/llvm_distributions.bzl
@@ -924,8 +924,8 @@ def _find_llvm_basename_list(llvm_version, all_llvm_distributions, host_info):
             ], all_llvm_distributions = all_llvm_distributions)
 
         arch_alias_list = {
-            "x86_32": ["x86_32", "i386"],
-            "x86_64": ["x86_64", "amd64", "i686"],
+            "x86_32": ["x86_32", "i386", "i686"],
+            "x86_64": ["x86_64", "amd64"],
             "powerpc64": ["powerpc64", "final_powerpc64"],
         }.get(arch, [arch])
 
diff --git a/toolchain/internal/llvm_distributions.golden.out.txt b/toolchain/internal/llvm_distributions.golden.out.txt
index 938ccdf43..639357377 100644
--- a/toolchain/internal/llvm_distributions.golden.out.txt
+++ b/toolchain/internal/llvm_distributions.golden.out.txt
@@ -63,7 +63,6 @@ version: 20.1.1
 version: 20.1.2
 version: 20.1.3
 version: 20.1.4
-del: clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
 del: clang+llvm-9.0.0-sparcv9-sun-solaris2.11.tar.xz
 del: clang+llvm-9.0.0-x86_64-pc-linux-gnu.tar.xz
 del: clang+llvm-10.0.0-sparcv9-sun-solaris2.11.tar.xz
diff --git a/toolchain/internal/llvm_distributions.golden.sel.txt b/toolchain/internal/llvm_distributions.golden.sel.txt
index 64e069e5d..8108cc229 100644
--- a/toolchain/internal/llvm_distributions.golden.sel.txt
+++ b/toolchain/internal/llvm_distributions.golden.sel.txt
@@ -266,24 +266,24 @@
 6.0.0-sparcv9-windows/windows/ -> ERROR: No version selected
 6.0.0-x86_32-darwin/darwin/ -> ERROR: No version selected
 6.0.0-x86_32-linux/amzn/0 -> ERROR: No version selected
-6.0.0-x86_32-linux/arch/0 -> ERROR: No version selected
-6.0.0-x86_32-linux/centos/6 -> ERROR: No version selected
-6.0.0-x86_32-linux/centos/7 -> ERROR: No version selected
-6.0.0-x86_32-linux/debian/0 -> ERROR: No version selected
-6.0.0-x86_32-linux/debian/8 -> ERROR: No version selected
-6.0.0-x86_32-linux/debian/9 -> ERROR: No version selected
-6.0.0-x86_32-linux/fedora/26 -> ERROR: No version selected
-6.0.0-x86_32-linux/fedora/27 -> ERROR: No version selected
-6.0.0-x86_32-linux/fedora/42 -> ERROR: No version selected
+6.0.0-x86_32-linux/arch/0 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/centos/6 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/centos/7 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/debian/0 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/debian/8 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/debian/9 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/fedora/26 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/fedora/27 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/fedora/42 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
 6.0.0-x86_32-linux/freebsd/10 -> clang+llvm-6.0.0-i386-unknown-freebsd-10.tar.xz
 6.0.0-x86_32-linux/freebsd/11 -> ERROR: No version selected
 6.0.0-x86_32-linux/freebsd/12 -> ERROR: No version selected
 6.0.0-x86_32-linux/freebsd/13 -> ERROR: No version selected
-6.0.0-x86_32-linux/linuxmint/18 -> ERROR: No version selected
-6.0.0-x86_32-linux/linuxmint/19 -> ERROR: No version selected
+6.0.0-x86_32-linux/linuxmint/18 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/linuxmint/19 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
 6.0.0-x86_32-linux/pc-solaris/2.11 -> ERROR: No version selected
 6.0.0-x86_32-linux/raspbian/0 -> ERROR: No version selected
-6.0.0-x86_32-linux/rhel/0 -> ERROR: No version selected
+6.0.0-x86_32-linux/rhel/0 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
 6.0.0-x86_32-linux/sun-solaris/2.11 -> ERROR: No version selected
 6.0.0-x86_32-linux/suse/11.3 -> ERROR: No version selected
 6.0.0-x86_32-linux/suse/12.2 -> ERROR: No version selected
@@ -292,15 +292,15 @@
 6.0.0-x86_32-linux/suse/15.5 -> ERROR: No version selected
 6.0.0-x86_32-linux/suse/16.0 -> ERROR: No version selected
 6.0.0-x86_32-linux/suse/17.0 -> ERROR: No version selected
-6.0.0-x86_32-linux/ubuntu/14.04 -> ERROR: No version selected
-6.0.0-x86_32-linux/ubuntu/16.04 -> ERROR: No version selected
-6.0.0-x86_32-linux/ubuntu/18.04.5 -> ERROR: No version selected
-6.0.0-x86_32-linux/ubuntu/18.04.6 -> ERROR: No version selected
-6.0.0-x86_32-linux/ubuntu/18.04 -> ERROR: No version selected
-6.0.0-x86_32-linux/ubuntu/20.04 -> ERROR: No version selected
-6.0.0-x86_32-linux/ubuntu/20.10 -> ERROR: No version selected
-6.0.0-x86_32-linux/ubuntu/22.04 -> ERROR: No version selected
-6.0.0-x86_32-linux/ubuntu/24.04 -> ERROR: No version selected
+6.0.0-x86_32-linux/ubuntu/14.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/ubuntu/16.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/ubuntu/18.04.5 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/ubuntu/18.04.6 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/ubuntu/18.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/ubuntu/20.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/ubuntu/20.10 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/ubuntu/22.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
+6.0.0-x86_32-linux/ubuntu/24.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
 6.0.0-x86_32-windows/windows/ -> ERROR: No version selected
 6.0.0-x86_64-darwin/darwin/ -> clang+llvm-6.0.0-x86_64-apple-darwin.tar.xz
 6.0.0-x86_64-linux/amzn/0 -> clang+llvm-6.0.0-x86_64-linux-sles12.2.tar.xz