Skip to content

Commit edd970c

Browse files
author
Marcus Boerger
authored
Platform i686 is of course still 32bit... (#496)
1 parent 23721c9 commit edd970c

File tree

3 files changed

+23
-24
lines changed

3 files changed

+23
-24
lines changed

‎toolchain/internal/llvm_distributions.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,8 +924,8 @@ def _find_llvm_basename_list(llvm_version, all_llvm_distributions, host_info):
924924
], all_llvm_distributions = all_llvm_distributions)
925925

926926
arch_alias_list = {
927-
"x86_32": ["x86_32", "i386"],
928-
"x86_64": ["x86_64", "amd64", "i686"],
927+
"x86_32": ["x86_32", "i386", "i686"],
928+
"x86_64": ["x86_64", "amd64"],
929929
"powerpc64": ["powerpc64", "final_powerpc64"],
930930
}.get(arch, [arch])
931931

‎toolchain/internal/llvm_distributions.golden.out.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ version: 20.1.1
6363
version: 20.1.2
6464
version: 20.1.3
6565
version: 20.1.4
66-
del: clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
6766
del: clang+llvm-9.0.0-sparcv9-sun-solaris2.11.tar.xz
6867
del: clang+llvm-9.0.0-x86_64-pc-linux-gnu.tar.xz
6968
del: clang+llvm-10.0.0-sparcv9-sun-solaris2.11.tar.xz

‎toolchain/internal/llvm_distributions.golden.sel.txt‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -266,24 +266,24 @@
266266
6.0.0-sparcv9-windows/windows/ -> ERROR: No version selected
267267
6.0.0-x86_32-darwin/darwin/ -> ERROR: No version selected
268268
6.0.0-x86_32-linux/amzn/0 -> ERROR: No version selected
269-
6.0.0-x86_32-linux/arch/0 -> ERROR: No version selected
270-
6.0.0-x86_32-linux/centos/6 -> ERROR: No version selected
271-
6.0.0-x86_32-linux/centos/7 -> ERROR: No version selected
272-
6.0.0-x86_32-linux/debian/0 -> ERROR: No version selected
273-
6.0.0-x86_32-linux/debian/8 -> ERROR: No version selected
274-
6.0.0-x86_32-linux/debian/9 -> ERROR: No version selected
275-
6.0.0-x86_32-linux/fedora/26 -> ERROR: No version selected
276-
6.0.0-x86_32-linux/fedora/27 -> ERROR: No version selected
277-
6.0.0-x86_32-linux/fedora/42 -> ERROR: No version selected
269+
6.0.0-x86_32-linux/arch/0 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
270+
6.0.0-x86_32-linux/centos/6 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
271+
6.0.0-x86_32-linux/centos/7 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
272+
6.0.0-x86_32-linux/debian/0 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
273+
6.0.0-x86_32-linux/debian/8 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
274+
6.0.0-x86_32-linux/debian/9 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
275+
6.0.0-x86_32-linux/fedora/26 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
276+
6.0.0-x86_32-linux/fedora/27 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
277+
6.0.0-x86_32-linux/fedora/42 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
278278
6.0.0-x86_32-linux/freebsd/10 -> clang+llvm-6.0.0-i386-unknown-freebsd-10.tar.xz
279279
6.0.0-x86_32-linux/freebsd/11 -> ERROR: No version selected
280280
6.0.0-x86_32-linux/freebsd/12 -> ERROR: No version selected
281281
6.0.0-x86_32-linux/freebsd/13 -> ERROR: No version selected
282-
6.0.0-x86_32-linux/linuxmint/18 -> ERROR: No version selected
283-
6.0.0-x86_32-linux/linuxmint/19 -> ERROR: No version selected
282+
6.0.0-x86_32-linux/linuxmint/18 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
283+
6.0.0-x86_32-linux/linuxmint/19 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
284284
6.0.0-x86_32-linux/pc-solaris/2.11 -> ERROR: No version selected
285285
6.0.0-x86_32-linux/raspbian/0 -> ERROR: No version selected
286-
6.0.0-x86_32-linux/rhel/0 -> ERROR: No version selected
286+
6.0.0-x86_32-linux/rhel/0 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
287287
6.0.0-x86_32-linux/sun-solaris/2.11 -> ERROR: No version selected
288288
6.0.0-x86_32-linux/suse/11.3 -> ERROR: No version selected
289289
6.0.0-x86_32-linux/suse/12.2 -> ERROR: No version selected
@@ -292,15 +292,15 @@
292292
6.0.0-x86_32-linux/suse/15.5 -> ERROR: No version selected
293293
6.0.0-x86_32-linux/suse/16.0 -> ERROR: No version selected
294294
6.0.0-x86_32-linux/suse/17.0 -> ERROR: No version selected
295-
6.0.0-x86_32-linux/ubuntu/14.04 -> ERROR: No version selected
296-
6.0.0-x86_32-linux/ubuntu/16.04 -> ERROR: No version selected
297-
6.0.0-x86_32-linux/ubuntu/18.04.5 -> ERROR: No version selected
298-
6.0.0-x86_32-linux/ubuntu/18.04.6 -> ERROR: No version selected
299-
6.0.0-x86_32-linux/ubuntu/18.04 -> ERROR: No version selected
300-
6.0.0-x86_32-linux/ubuntu/20.04 -> ERROR: No version selected
301-
6.0.0-x86_32-linux/ubuntu/20.10 -> ERROR: No version selected
302-
6.0.0-x86_32-linux/ubuntu/22.04 -> ERROR: No version selected
303-
6.0.0-x86_32-linux/ubuntu/24.04 -> ERROR: No version selected
295+
6.0.0-x86_32-linux/ubuntu/14.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
296+
6.0.0-x86_32-linux/ubuntu/16.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
297+
6.0.0-x86_32-linux/ubuntu/18.04.5 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
298+
6.0.0-x86_32-linux/ubuntu/18.04.6 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
299+
6.0.0-x86_32-linux/ubuntu/18.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
300+
6.0.0-x86_32-linux/ubuntu/20.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
301+
6.0.0-x86_32-linux/ubuntu/20.10 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
302+
6.0.0-x86_32-linux/ubuntu/22.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
303+
6.0.0-x86_32-linux/ubuntu/24.04 -> clang+llvm-6.0.0-i686-linux-gnu-Fedora27.tar.xz
304304
6.0.0-x86_32-windows/windows/ -> ERROR: No version selected
305305
6.0.0-x86_64-darwin/darwin/ -> clang+llvm-6.0.0-x86_64-apple-darwin.tar.xz
306306
6.0.0-x86_64-linux/amzn/0 -> clang+llvm-6.0.0-x86_64-linux-sles12.2.tar.xz

0 commit comments

Comments
 (0)