aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-01-14 11:49:45 -0800
committerDylan Baker <dylan@pnwbakers.com>2020-01-15 09:56:13 -0800
commit3b691a89bd8a2cf0546d2d2056bfc782f376fa0d (patch)
tree50278a4a4bc5aa5e9eaf9585c695432b4f099515
parentb9d0c7a1698e2ba5fd39c1217eff872707ac9a6b (diff)
downloadmeson-3b691a89bd8a2cf0546d2d2056bfc782f376fa0d.zip
meson-3b691a89bd8a2cf0546d2d2056bfc782f376fa0d.tar.gz
meson-3b691a89bd8a2cf0546d2d2056bfc782f376fa0d.tar.bz2
Add s390 to list of known architectures
Fixes #6411
-rw-r--r--docs/markdown/Reference-tables.md1
-rw-r--r--mesonbuild/envconfig.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md
index 61f4803..8fd7a1d 100644
--- a/docs/markdown/Reference-tables.md
+++ b/docs/markdown/Reference-tables.md
@@ -78,6 +78,7 @@ set in the cross file.
| riscv64 | 64 bit RISC-V Open ISA|
| rl78 | Renesas RL78 |
| rx | Renesas RX 32 bit MCU |
+| s390 | IBM zSystem s390 |
| s390x | IBM zSystem s390x |
| sparc | 32 bit SPARC |
| sparc64 | SPARC v9 processor |
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index 98644c0..67e56d1 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -52,6 +52,7 @@ known_cpu_families = (
'riscv64',
'rl78',
'rx',
+ 's390',
's390x',
'sparc',
'sparc64',