aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-06-21 23:11:22 +0300
committerGitHub <noreply@github.com>2020-06-21 23:11:22 +0300
commitda018da7539d016258c5c5f44d51ee28a7e86eee (patch)
tree051383ee37a30b1273db73e474c364738f058d16
parent91680324035dd19ccf256cc1efba4ea7352e80c5 (diff)
parentb384f82b9a69d488f660dca37d14abed1f4c6500 (diff)
downloadmeson-da018da7539d016258c5c5f44d51ee28a7e86eee.zip
meson-da018da7539d016258c5c5f44d51ee28a7e86eee.tar.gz
meson-da018da7539d016258c5c5f44d51ee28a7e86eee.tar.bz2
Merge pull request #7359 from dcbaker/submit/2020-06/sh4
Add SuperH SH-4 support
-rw-r--r--docs/markdown/Reference-tables.md7
-rw-r--r--mesonbuild/envconfig.py5
2 files changed, 7 insertions, 5 deletions
diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md
index 81ce921..48f43f9 100644
--- a/docs/markdown/Reference-tables.md
+++ b/docs/markdown/Reference-tables.md
@@ -82,14 +82,16 @@ set in the cross file.
| arc | 32 bit ARC processor |
| arm | 32 bit ARM processor |
| avr | Atmel AVR processor |
-| e2k | MCST Elbrus processor |
| c2000 | 32 bit C2000 processor |
+| dspic | 16 bit Microchip dsPIC |
+| 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 |
+| pic24 | 16 bit Microchip PIC24 |
| ppc | 32 bit PPC processors |
| ppc64 | 64 bit PPC processors |
| riscv32 | 32 bit RISC-V Open ISA |
@@ -98,12 +100,11 @@ set in the cross file.
| rx | Renesas RX 32 bit MCU |
| s390 | IBM zSystem s390 |
| s390x | IBM zSystem s390x |
+| sh4 | SuperH SH-4 |
| sparc | 32 bit SPARC |
| sparc64 | SPARC v9 processor |
| wasm32 | 32 bit Webassembly |
| wasm64 | 64 bit Webassembly |
-| pic24 | 16 bit Microchip PIC24 |
-| dspic | 16 bit Microchip dsPIC |
| x86 | 32 bit x86 processor |
| x86_64 | 64 bit x86 processor |
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index b0dde65..10464a2 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -42,6 +42,7 @@ known_cpu_families = (
'arm',
'avr',
'c2000',
+ 'dspic',
'e2k',
'ia64',
'm68k',
@@ -49,6 +50,7 @@ known_cpu_families = (
'mips',
'mips64',
'parisc',
+ 'pic24',
'ppc',
'ppc64',
'riscv32',
@@ -57,10 +59,9 @@ known_cpu_families = (
'rx',
's390',
's390x',
+ 'sh4',
'sparc',
'sparc64',
- 'pic24',
- 'dspic',
'wasm32',
'wasm64',
'x86',