This is an automated email from the ASF dual-hosted git repository. jerzy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit d4a05ffb5d34170ae47b23f273c7aea64035cfc9 Author: Jerzy Kasenberg <[email protected]> AuthorDate: Wed May 31 10:24:19 2023 +0200 compiler: Move -specs to baselibc settings Every compiler.yml had ld.flags with -specs-nosys.specs which is fine for baselibc. Changing to newlib-nano provided by compiler could lead to conflict. Now -specs=nosys.specs is moved to baselibc settings and can be different if baselibc is not used. Signed-off-by: Jerzy Kasenberg <[email protected]> --- compiler/arc/compiler.yml | 2 +- compiler/arm-none-eabi-m0/compiler.yml | 2 +- compiler/arm-none-eabi-m3/compiler.yml | 2 +- compiler/arm-none-eabi-m33/compiler.yml | 2 +- compiler/arm-none-eabi-m4/compiler.yml | 2 +- compiler/arm-none-eabi-m7/compiler.yml | 2 +- compiler/riscv-none-embed/compiler.yml | 2 +- compiler/riscv64/compiler.yml | 2 +- libc/baselibc/pkg.yml | 3 +++ 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/compiler/arc/compiler.yml b/compiler/arc/compiler.yml index a8a67470e..df2567572 100644 --- a/compiler/arc/compiler.yml +++ b/compiler/arc/compiler.yml @@ -31,6 +31,6 @@ compiler.flags.debug: [compiler.flags.default, -Og, -ggdb] compiler.as.flags: [-x, assembler-with-cpp] -compiler.ld.flags: -static -specs=nosys.specs -lgcc -Wl,--gc-sections -nostartfiles +compiler.ld.flags: -static -lgcc -Wl,--gc-sections -nostartfiles compiler.ld.resolve_circular_deps: true compiler.ld.mapfile: true diff --git a/compiler/arm-none-eabi-m0/compiler.yml b/compiler/arm-none-eabi-m0/compiler.yml index 802e472a3..7583b3dc1 100644 --- a/compiler/arm-none-eabi-m0/compiler.yml +++ b/compiler/arm-none-eabi-m0/compiler.yml @@ -32,6 +32,6 @@ compiler.flags.debug: [compiler.flags.default, -Og, -ggdb] compiler.as.flags: [-x, assembler-with-cpp] -compiler.ld.flags: -static -specs=nosys.specs -lgcc -Wl,--gc-sections -nostartfiles +compiler.ld.flags: -static -lgcc -Wl,--gc-sections -nostartfiles compiler.ld.resolve_circular_deps: true compiler.ld.mapfile: true diff --git a/compiler/arm-none-eabi-m3/compiler.yml b/compiler/arm-none-eabi-m3/compiler.yml index ab4616724..466fa13e3 100644 --- a/compiler/arm-none-eabi-m3/compiler.yml +++ b/compiler/arm-none-eabi-m3/compiler.yml @@ -33,6 +33,6 @@ compiler.flags.debug: [compiler.flags.base, -Og, -ggdb] compiler.as.flags: [-x, assembler-with-cpp] -compiler.ld.flags: -static -specs=nosys.specs -lgcc -Wl,--gc-sections -nostartfiles +compiler.ld.flags: -static -lgcc -Wl,--gc-sections -nostartfiles compiler.ld.resolve_circular_deps: true compiler.ld.mapfile: true diff --git a/compiler/arm-none-eabi-m33/compiler.yml b/compiler/arm-none-eabi-m33/compiler.yml index e7115a021..4fd085fc8 100644 --- a/compiler/arm-none-eabi-m33/compiler.yml +++ b/compiler/arm-none-eabi-m33/compiler.yml @@ -33,6 +33,6 @@ compiler.flags.debug: [compiler.flags.base, -Og, -ggdb] compiler.as.flags: [-x, assembler-with-cpp] -compiler.ld.flags: -static -specs=nosys.specs -lgcc -Wl,--gc-sections -nostartfiles +compiler.ld.flags: -static -lgcc -Wl,--gc-sections -nostartfiles compiler.ld.resolve_circular_deps: true compiler.ld.mapfile: true diff --git a/compiler/arm-none-eabi-m4/compiler.yml b/compiler/arm-none-eabi-m4/compiler.yml index 8f8240812..dd4d08230 100644 --- a/compiler/arm-none-eabi-m4/compiler.yml +++ b/compiler/arm-none-eabi-m4/compiler.yml @@ -33,6 +33,6 @@ compiler.flags.debug: [compiler.flags.base, -Og, -ggdb] compiler.as.flags: [-x, assembler-with-cpp] -compiler.ld.flags: -static -specs=nosys.specs -lgcc -Wl,--gc-sections -nostartfiles +compiler.ld.flags: -static -lgcc -Wl,--gc-sections -nostartfiles compiler.ld.resolve_circular_deps: true compiler.ld.mapfile: true diff --git a/compiler/arm-none-eabi-m7/compiler.yml b/compiler/arm-none-eabi-m7/compiler.yml index 5509bb390..c9e133f09 100644 --- a/compiler/arm-none-eabi-m7/compiler.yml +++ b/compiler/arm-none-eabi-m7/compiler.yml @@ -33,6 +33,6 @@ compiler.flags.debug: [compiler.flags.base, -O0, -ggdb] compiler.as.flags: [-x, assembler-with-cpp] -compiler.ld.flags: -static -specs=nosys.specs -lgcc -Wl,--gc-sections -nostartfiles +compiler.ld.flags: -static -lgcc -Wl,--gc-sections -nostartfiles compiler.ld.resolve_circular_deps: true compiler.ld.mapfile: true diff --git a/compiler/riscv-none-embed/compiler.yml b/compiler/riscv-none-embed/compiler.yml index 2f8da8f91..962e0be90 100644 --- a/compiler/riscv-none-embed/compiler.yml +++ b/compiler/riscv-none-embed/compiler.yml @@ -33,6 +33,6 @@ compiler.flags.debug: [compiler.flags.base, -Og, -ggdb] compiler.as.flags: [-x assembler-with-cpp] -compiler.ld.flags: -static -specs=nosys.specs -Wl,--gc-sections -nostartfiles +compiler.ld.flags: -static -Wl,--gc-sections -nostartfiles compiler.ld.resolve_circular_deps: true compiler.ld.mapfile: true diff --git a/compiler/riscv64/compiler.yml b/compiler/riscv64/compiler.yml index 2896394fe..c52629acf 100644 --- a/compiler/riscv64/compiler.yml +++ b/compiler/riscv64/compiler.yml @@ -33,6 +33,6 @@ compiler.flags.debug: [compiler.flags.base, -Og, -ggdb] compiler.as.flags: [-x assembler-with-cpp] -compiler.ld.flags: -static -specs=nosys.specs -Wl,--gc-sections -nostartfiles +compiler.ld.flags: -static -Wl,--gc-sections -nostartfiles compiler.ld.resolve_circular_deps: true compiler.ld.mapfile: true diff --git a/libc/baselibc/pkg.yml b/libc/baselibc/pkg.yml index 861a4a9ef..b751946e8 100644 --- a/libc/baselibc/pkg.yml +++ b/libc/baselibc/pkg.yml @@ -33,3 +33,6 @@ pkg.init.BASELIBC_THREAD_SAFE_HEAP_ALLOCATION: pkg.cflags: - -fno-builtin-malloc + +pkg.lflags: + - -specs=nosys.specs:
