aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-07-31 19:07:48 +0300
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-08-11 04:21:55 -0700
commit1b2f8acbeba554f3a459bb32f8c6665c4f39376b (patch)
tree2e8c3b357b30dfaff9e8897eb2a49fa627cddd22
parentae5ebd258f45cbca94197c8d380628095680544d (diff)
downloadmeson-1b2f8acbeba554f3a459bb32f8c6665c4f39376b.zip
meson-1b2f8acbeba554f3a459bb32f8c6665c4f39376b.tar.gz
meson-1b2f8acbeba554f3a459bb32f8c6665c4f39376b.tar.bz2
Add support for s390x CPUs. Closes #3897.
-rw-r--r--docs/markdown/Reference-tables.md1
-rw-r--r--mesonbuild/environment.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md
index 989e649..9aa8609 100644
--- a/docs/markdown/Reference-tables.md
+++ b/docs/markdown/Reference-tables.md
@@ -57,6 +57,7 @@ set in the cross file.
| riscv64 | 64 bit RISC-V Open ISA|
| sparc | 32 bit SPARC |
| sparc64 | SPARC v9 processor |
+| s390x | IBM zSystem s390x |
Any cpu family not listed in the above list is not guaranteed to
remain stable in future releases.
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 28c26e2..6688c62 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -86,6 +86,7 @@ known_cpu_families = (
'ppc64',
'riscv32',
'riscv64',
+ 's390x',
'sparc',
'sparc64',
'x86',