Skip to content

Commit 6367c8f

Browse files
committed
scripts: Update clang scripts for arm libgcc version
With the new gcc on debian, we need to look for libgcc in that directory. Signed-off-by: Keith Packard <[email protected]>
1 parent 3a98ffa commit 6367c8f

9 files changed

+101
-12
lines changed

scripts/cross-clang-cortex-r82.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
[binaries]
2+
# Meson 0.53.2 doesn't use any cflags when doing basic compiler tests,
3+
# so we have to add -nostdlib to the compiler configuration itself or
4+
# early compiler tests will fail. This can be removed when picolibc
5+
# requires at least version 0.54.2 of meson.
6+
c = ['clang', '-m64', '-target', 'aarch64-none-elf', '-march=armv8-r', '-mabi=aapcs', '-nostdlib']
7+
cpp = ['clang', '-m64', '-target', 'aarch64-none-elf', '-march=armv8-r', '-mabi=aapcs', '-nostdlib']
8+
ar = 'ar'
9+
as = 'as'
10+
nm = 'nm'
11+
strip = 'strip'
12+
# only needed to run tests
13+
exe_wrapper = ['sh', '-c', 'test -z "$PICOLIBC_TEST" || run-aarch64 "$@"', 'run-aarch64']
14+
15+
[host_machine]
16+
system = 'none'
17+
cpu_family = 'aarch64'
18+
cpu = 'aarch64'
19+
endian = 'little'
20+
21+
[properties]
22+
skip_sanity_check = true
23+
libgcc='-lclang_rt.builtins-aarch64'
24+
default_flash_addr = '0x40000000'
25+
default_flash_size = '0x00400000'
26+
default_ram_addr = '0x40400000'
27+
default_ram_size = '0x00200000'
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[binaries]
2+
# Meson 0.53.2 doesn't use any cflags when doing basic compiler tests,
3+
# so we have to add -nostdlib to the compiler configuration itself or
4+
# early compiler tests will fail. This can be removed when picolibc
5+
# requires at least version 0.54.2 of meson.
6+
c = ['clang', '-target', 'riscv32-none-elf']
7+
cpp = ['clang', '-target', 'riscv32-none-elf']
8+
c_ld = 'lld'
9+
cpp_ld = 'lld'
10+
ar = 'llvm-ar'
11+
as = 'clang'
12+
nm = 'llvm-nm'
13+
strip = 'llvm-strip'
14+
# only needed to run tests
15+
exe_wrapper = ['sh', '-c', 'test -z "$PICOLIBC_TEST" || run-riscv "$@"', 'run-riscv']
16+
17+
[host_machine]
18+
system = 'none'
19+
cpu_family = 'riscv64'
20+
cpu = 'riscv'
21+
endian = 'little'
22+
23+
[properties]
24+
c_args = ['-Werror=double-promotion']
25+
skip_sanity_check = true
26+
has_link_defsym = true
27+
default_flash_addr = '0x80000000'
28+
default_flash_size = '0x00200000'
29+
default_ram_addr = '0x80200000'
30+
default_ram_size = '0x00200000'

scripts/cross-clang-rv32imafc.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[binaries]
2+
# Meson 0.53.2 doesn't use any cflags when doing basic compiler tests,
3+
# so we have to add -nostdlib to the compiler configuration itself or
4+
# early compiler tests will fail. This can be removed when picolibc
5+
# requires at least version 0.54.2 of meson.
6+
c = ['clang', '-m32', '-target', 'riscv32-unknown-elf', '-march=rv32imafc', '-mabi=ilp32f', '-nostdlib']
7+
cpp = ['clang', '-m32', '-target', 'riscv32-unknown-elf', '-march=rv32imafc', '-mabi=ilp32f', '-nostdlib']
8+
c_ld = '/usr/bin/riscv64-unknown-elf-ld'
9+
cpp_ld = '/usr/bin/riscv64-unknown-elf-ld'
10+
ar = 'riscv64-unknown-elf-ar'
11+
as = 'riscv64-unknown-elf-as'
12+
nm = 'riscv64-unknown-elf-nm'
13+
strip = 'riscv64-unknown-elf-strip'
14+
# only needed to run tests
15+
exe_wrapper = ['sh', '-c', 'test -z "$PICOLIBC_TEST" || run-riscv "$@"', 'run-riscv']
16+
17+
[host_machine]
18+
system = 'none'
19+
cpu_family = 'riscv32'
20+
cpu = 'riscv'
21+
endian = 'little'
22+
23+
[properties]
24+
c_args = ['-Werror=double-promotion']
25+
c_link_args = ['-Wl,-melf32lriscv', '-L/usr/lib/gcc/riscv64-unknown-elf/14.2.0/rv32imafdc/ilp32d', '-L/usr/lib/gcc/riscv64-unknown-elf/13.2.0/rv32imafdc/ilp32d', '-L/usr/lib/gcc/riscv64-unknown-elf/12.2.0/rv32imafdc/ilp32d', '-L/usr/lib/gcc/riscv64-unknown-elf/12.1.0/rv32imafdc/ilp32d']
26+
cpp_link_args = ['-Wl,-melf32lriscv', '-L/usr/lib/gcc/riscv64-unknown-elf/14.2.0/rv32imafdc/ilp32d', '-L/usr/lib/gcc/riscv64-unknown-elf/13.2.0/rv32imafdc/ilp32d', '-L/usr/lib/gcc/riscv64-unknown-elf/12.2.0/rv32imafdc/ilp32d', '-L/usr/lib/gcc/riscv64-unknown-elf/12.1.0/rv32imafdc/ilp32d']
27+
skip_sanity_check = true
28+
has_link_defsym = true
29+
default_flash_addr = '0x80000000'
30+
default_flash_size = '0x00200000'
31+
default_ram_addr = '0x80200000'
32+
default_ram_size = '0x00200000'

scripts/cross-clang-thumb-none-eabi.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ endian = 'little'
2020

2121
[properties]
2222
c_args = ['-Werror=double-promotion', '-Wno-unsupported-floating-point-opt', '-fshort-enums']
23-
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
24-
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
23+
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
24+
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
2525
skip_sanity_check = true
2626
default_flash_addr = '0x00000000'
2727
default_flash_size = '0x00400000'

scripts/cross-clang-thumbv6m-none-eabi.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ endian = 'little'
2020

2121
[properties]
2222
c_args = ['-Werror=double-promotion', '-Wno-unsupported-floating-point-opt', '-fshort-enums']
23-
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/10.3.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/11.3.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/12.2.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/12.3.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/v6-m/nofp/', '-Wl,-z,noexecstack']
24-
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/10.3.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/11.3.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/12.2.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/12.3.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/v6-m/nofp/', '-Wl,-z,noexecstack']
23+
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v6-m/nofp/', '-Wl,-z,noexecstack']
24+
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/v6-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v6-m/nofp/', '-Wl,-z,noexecstack']
2525
skip_sanity_check = true
2626
default_flash_addr = '0x00000000'
2727
default_flash_size = '0x00400000'

scripts/cross-clang-thumbv7-a-none-eabi.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ endian = 'little'
2020

2121
[properties]
2222
c_args = ['-Werror=double-promotion', '-Wno-unsupported-floating-point-opt', '-fshort-enums']
23-
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7-a/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/v7-a/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
24-
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7-a/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/v7-a/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
23+
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/v7-a/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7-a/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
24+
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/v7-a/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7-a/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
2525
skip_sanity_check = true
2626
default_flash_addr = '0x00000000'
2727
default_flash_size = '0x00400000'

scripts/cross-clang-thumbv7e+dp-none-eabi.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ endian = 'little'
2020

2121
[properties]
2222
c_args = ['-Werror=double-promotion', '-Wno-unsupported-floating-point-opt', '-fshort-enums']
23-
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7e-m+dp/hard/', '-L/usr/lib/gcc/arm-none-eabi/10.3.1/thumb/v7e-m+dp/hard/', '-L/usr/lib/gcc/arm-none-eabi/11.3.1/thumb/v7e-m+dp/hard/', '-L/usr/lib/gcc/arm-none-eabi/12.2.1/thumb/v7e-m+dp/hard/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/v7e-m+dp/hard/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
24-
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7e-m+dp/hard/', '-L/usr/lib/gcc/arm-none-eabi/10.3.1/thumb/v7e-m+dp/hard/', '-L/usr/lib/gcc/arm-none-eabi/11.3.1/thumb/v7e-m+dp/hard/', '-L/usr/lib/gcc/arm-none-eabi/12.2.1/thumb/v7e-m+dp/hard/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/v7e-m+dp/hard/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
23+
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/v7e-m+dp/hard/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7e-m+dp/hard/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
24+
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/v7e-m+dp/hard/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7e-m+dp/hard/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
2525
skip_sanity_check = true
2626
default_flash_addr = '0x00000000'
2727
default_flash_size = '0x00400000'

scripts/cross-clang-thumbv7e+fp-none-eabi.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ endian = 'little'
2020

2121
[properties]
2222
c_args = ['-Werror=double-promotion', '-Wno-unsupported-floating-point-opt', '-fshort-enums']
23-
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/10.3.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/11.3.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/12.2.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/12.3.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/v7e-m+fp/hard/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
24-
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/10.3.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/11.3.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/12.2.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/12.3.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/v7e-m+fp/hard/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
23+
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7e-m+fp/hard/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
24+
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/v7e-m+fp/hard/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7e-m+fp/hard/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
2525
skip_sanity_check = true
2626
default_flash_addr = '0x00000000'
2727
default_flash_size = '0x00400000'

scripts/cross-clang-thumbv7m-none-eabi.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ endian = 'little'
2020

2121
[properties]
2222
c_args = ['-Werror=double-promotion', '-Wno-unsupported-floating-point-opt', '-fshort-enums']
23-
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/10.3.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/11.3.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/12.2.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/12.3.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/v7-m/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
24-
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/10.3.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/11.3.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/12.2.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/12.3.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.2.1/thumb/v7-m/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
23+
c_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7-m/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
24+
cpp_link_args = ['-L/usr/lib/gcc/arm-none-eabi/14.2.1/thumb/v7-m/nofp/', '-L/usr/lib/gcc/arm-none-eabi/13.3.1/thumb/v7-m/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
2525
skip_sanity_check = true
2626
default_flash_addr = '0x00000000'
2727
default_flash_size = '0x00400000'

0 commit comments

Comments
 (0)