Skip to content

Commit 6c100c1

Browse files
committed
scripts: Add gcc version 13.3.1 to arm clang scripts
We use libgcc when building with clang because compiler-rt isn't always available. That means we need a path to the library for linking, and that has a gcc version embedded in it. Debian has updated gcc-arm-none-eabi to version 13.3.1, so add that to the clang configs. Signed-off-by: Keith Packard <[email protected]>
1 parent 400f1e5 commit 6c100c1

6 files changed

+12
-12
lines changed

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.2.1/thumb/nofp/', '-Wl,-z,noexecstack', '-Wno-unused-command-line-argument']
24-
cpp_link_args = ['-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/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']
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/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/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/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']
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.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.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/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']
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/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/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/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']
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/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/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/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']
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/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/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/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']
2525
skip_sanity_check = true
2626
default_flash_addr = '0x00000000'
2727
default_flash_size = '0x00400000'

0 commit comments

Comments
 (0)