Fix llvm-exegesis failures on s390x
This commit is contained in:
parent
3c4fee7794
commit
55d7730bb8
@ -1,24 +1,21 @@
|
|||||||
diff --git a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg
|
diff --git a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg
|
||||||
index 135f5796b583..20de4ec2cc66 100644
|
|
||||||
--- a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg
|
--- a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg
|
||||||
+++ b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg
|
+++ b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg
|
||||||
@@ -1,3 +1,7 @@
|
@@ -1,3 +1,6 @@
|
||||||
+if 's390x' in config.root.host_triple:
|
|
||||||
+ # These tests fail to run on s390x.
|
|
||||||
+ config.unsupported = True
|
|
||||||
+
|
|
||||||
if not ('PowerPC' in config.root.targets):
|
if not ('PowerPC' in config.root.targets):
|
||||||
# We need support for PowerPC.
|
# We need support for PowerPC.
|
||||||
config.unsupported = True
|
config.unsupported = True
|
||||||
|
+elif not ('powerpc' in config.root.host_triple):
|
||||||
|
+ # We need to be running on an PPC host.
|
||||||
|
+ config.unsupported = True
|
||||||
diff --git a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg
|
diff --git a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg
|
||||||
index 7230f35fdb83..627bba4dc93d 100644
|
|
||||||
--- a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg
|
--- a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg
|
||||||
+++ b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg
|
+++ b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg
|
||||||
@@ -1,3 +1,7 @@
|
@@ -1,3 +1,6 @@
|
||||||
+if 's390x' in config.root.host_triple:
|
|
||||||
+ # These tests fail to run on s390x.
|
|
||||||
+ config.unsupported = True
|
|
||||||
+
|
|
||||||
if not ('X86' in config.root.targets):
|
if not ('X86' in config.root.targets):
|
||||||
# We need support for X86.
|
# We need support for X86.
|
||||||
config.unsupported = True
|
config.unsupported = True
|
||||||
|
+elif not ('x86_64' in config.root.host_triple):
|
||||||
|
+ # We need to be running on an X86 host.
|
||||||
|
+ config.unsupported = True
|
||||||
|
|
@ -75,7 +75,7 @@
|
|||||||
|
|
||||||
Name: %{pkg_name}
|
Name: %{pkg_name}
|
||||||
Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
|
Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: The Low Level Virtual Machine
|
Summary: The Low Level Virtual Machine
|
||||||
|
|
||||||
License: Apache-2.0 WITH LLVM-exception OR NCSA
|
License: Apache-2.0 WITH LLVM-exception OR NCSA
|
||||||
@ -93,7 +93,8 @@ Source7: run-lit-tests
|
|||||||
Source8: lit.fedora.cfg.py
|
Source8: lit.fedora.cfg.py
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Patch0: disable-exegesis-tests-s390x.patch
|
# Backport from LLVM 17.
|
||||||
|
Patch0: D145763.diff
|
||||||
|
|
||||||
# See https://reviews.llvm.org/D137890 for the next two patches
|
# See https://reviews.llvm.org/D137890 for the next two patches
|
||||||
Patch2: 0001-llvm-Add-install-targets-for-gtest.patch
|
Patch2: 0001-llvm-Add-install-targets-for-gtest.patch
|
||||||
@ -570,6 +571,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 10 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc3-2
|
||||||
|
- Fix llvm-exegesis failures on s390x
|
||||||
|
|
||||||
* Wed Feb 22 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc3-1
|
* Wed Feb 22 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc3-1
|
||||||
- Update to LLVM 16.0.0 RC3
|
- Update to LLVM 16.0.0 RC3
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user