diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-07-06 16:53:49 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-07-07 11:47:42 +0300 |
| commit | e3e2e4ca14f29bb6b78582092b91fa4567af4fc2 (patch) | |
| tree | 2b358a8d28ea668f4b72679a9a40bd7b4fa84837 | |
| parent | a37c31e8a3e075a15088ff119be40442cdb5d649 (diff) | |
| download | meson-e3e2e4ca14f29bb6b78582092b91fa4567af4fc2.zip meson-e3e2e4ca14f29bb6b78582092b91fa4567af4fc2.tar.gz meson-e3e2e4ca14f29bb6b78582092b91fa4567af4fc2.tar.bz2 | |
Canonicalise 64-bit PowerPC CPU families to "ppc64"
Instead of exposing the endianness in the CPU family, canonicalise the CPU
family to just "ppc64" to match MIPS (which is also bi-endian).
Part of the work for #3842.
| -rw-r--r-- | docs/markdown/Reference-tables.md | 5 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md index b1a7bf6..6486aa2 100644 --- a/docs/markdown/Reference-tables.md +++ b/docs/markdown/Reference-tables.md @@ -49,9 +49,8 @@ set in the cross file. | aarch64 | 64 bit ARM processor | | mips | 32 bit MIPS processor | | mips64 | 64 bit MIPS processor | -| ppc | 32 bit PPC processors (Big Endian) | -| ppc64 | 64 bit PPC processors (Big Endian) | -| ppc64le | 64 bit PPC processors (Little Endian) | +| ppc | 32 bit PPC processors | +| ppc64 | 64 bit PPC processors | | e2k | MCST Elbrus processor | | parisc | HP PA-RISC processor | | sparc64 | SPARC v9 processor | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 48d9fd4..f96e63f 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -84,7 +84,6 @@ known_cpu_families = ( 'parisc', 'ppc', 'ppc64', - 'ppc64le', 'sparc64', 'x86', 'x86_64' @@ -212,6 +211,8 @@ def detect_cpu_family(compilers): return 'x86' if trial.startswith('arm'): return 'arm' + if trial.startswith('ppc64'): + return 'ppc64' if trial in ('amd64', 'x64'): trial = 'x86_64' if trial == 'x86_64': |