diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-01-21 11:01:12 -0800 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-01-23 14:56:06 +0530 |
| commit | 70f4cf648cc1734e29efb11ab91121763987c44d (patch) | |
| tree | 4dabfbf0ad5f5a979a194bc7537762aec4f91394 | |
| parent | cfdd9067e7ed91d8ae3c82e006bd38ef7d9f8be4 (diff) | |
| download | meson-70f4cf648cc1734e29efb11ab91121763987c44d.zip meson-70f4cf648cc1734e29efb11ab91121763987c44d.tar.gz meson-70f4cf648cc1734e29efb11ab91121763987c44d.tar.bz2 | |
Add m68k to known cpus for Motorola 68000 series processors
Fixes #6492
| -rw-r--r-- | docs/markdown/Reference-tables.md | 53 | ||||
| -rw-r--r-- | mesonbuild/envconfig.py | 1 |
2 files changed, 28 insertions, 26 deletions
diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md index 8fd7a1d..225eaba 100644 --- a/docs/markdown/Reference-tables.md +++ b/docs/markdown/Reference-tables.md @@ -60,32 +60,33 @@ These are returned by the `cpu_family` method of `build_machine`, `host_machine` and `target_machine`. For cross compilation they are set in the cross file. -| Value | Comment | -| ----- | ------- | -| aarch64 | 64 bit ARM processor | -| alpha | DEC Alpha processor | -| arc | 32 bit ARC processor | -| arm | 32 bit ARM processor | -| e2k | MCST Elbrus processor | -| ia64 | Itanium processor | -| microblaze | MicroBlaze processor | -| mips | 32 bit MIPS processor | -| mips64 | 64 bit MIPS processor | -| parisc | HP PA-RISC processor | -| ppc | 32 bit PPC processors | -| ppc64 | 64 bit PPC processors | -| riscv32 | 32 bit RISC-V Open ISA| -| 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 | -| wasm32 | 32 bit Webassembly | -| wasm64 | 64 bit Webassembly | -| x86 | 32 bit x86 processor | -| x86_64 | 64 bit x86 processor | +| Value | Comment | +| ----- | ------- | +| aarch64 | 64 bit ARM processor | +| alpha | DEC Alpha processor | +| arc | 32 bit ARC processor | +| arm | 32 bit ARM processor | +| e2k | MCST Elbrus processor | +| ia64 | Itanium processor | +| m68k | Motorola 68000 processor | +| microblaze | MicroBlaze processor | +| mips | 32 bit MIPS processor | +| mips64 | 64 bit MIPS processor | +| parisc | HP PA-RISC processor | +| ppc | 32 bit PPC processors | +| ppc64 | 64 bit PPC processors | +| riscv32 | 32 bit RISC-V Open ISA | +| 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 | +| wasm32 | 32 bit Webassembly | +| wasm64 | 64 bit Webassembly | +| x86 | 32 bit x86 processor | +| x86_64 | 64 bit x86 processor | Any cpu family not listed in the above list is not guaranteed to remain stable in future releases. diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py index 9b88b66..47b219c 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -42,6 +42,7 @@ known_cpu_families = ( 'arm', 'e2k', 'ia64', + 'm68k', 'microblaze', 'mips', 'mips64', |