Skip to content

Commit

Permalink
Add 'riscv32' as an alias for riscv
Browse files Browse the repository at this point in the history
All of the RISC-V support runs on either 32- or 64- bit architectures,
but sometimes users will specific riscv32 or riscv64 explicitly. Allow
this by mapping riscv32 to riscv sources (as is already done for
riscv64).

Signed-off-by: Keith Packard <[email protected]>
  • Loading branch information
keith-packard committed Apr 28, 2020
1 parent d5f6910 commit 974f4e6
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions newlib/libc/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ machine_dirs = {
'or1knd': 'or1k',
'powerpc': 'powerpc',
'riscv': 'riscv',
'riscv32': 'riscv',
'riscv64': 'riscv',
'rl78': 'rl78',
'rx': 'rx',
Expand Down
1 change: 1 addition & 0 deletions newlib/libc/picolib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#
srcs_machine_tls = {
'riscv' : ['machine/riscv/tls.c'],
'riscv32' : ['machine/riscv/tls.c'],
'riscv64' : ['machine/riscv/tls.c'],
'arm' : ['machine/arm/tls.c']
}
Expand Down
1 change: 1 addition & 0 deletions newlib/libm/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ libm_machine_dirs = {
'i686' : 'i386',
'nds32' : 'nds32',
'riscv' : 'riscv',
'riscv32' : 'riscv',
'riscv64' : 'riscv',
'spu' : 'spu',
'xtensa': 'xtensa',
Expand Down
1 change: 1 addition & 0 deletions picocrt/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#
src_picocrt_machine = {
'riscv' : 'riscv/crt0.c',
'riscv32' : 'riscv/crt0.c',
'riscv64' : 'riscv/crt0.c',
'arm' : 'arm/crt0.c'
}
Expand Down
1 change: 1 addition & 0 deletions semihost/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#
src_semihost_machine = {
'riscv' : 'riscv/semihost-riscv.s',
'riscv32' : 'riscv/semihost-riscv.s',
'riscv64' : 'riscv/semihost-riscv.s',
'arm' : 'arm/semihost-arm.c'
}
Expand Down
5 changes: 5 additions & 0 deletions test-riscv32.ld
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
__flash = 0x80000000;
__flash_size = 0x00200000;
__ram = 0x80200000;
__ram_size = 0x200000;
__stack_size = 1k;
5 changes: 5 additions & 0 deletions test-riscv64.ld
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
__flash = 0x80000000;
__flash_size = 0x00200000;
__ram = 0x80200000;
__ram_size = 0x200000;
__stack_size = 1k;

0 comments on commit 974f4e6

Please sign in to comment.