You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2018/10/23 21:28:29 UTC
[mynewt-core] 03/03: compiler: separate flags into multiple strings
This is an automated email from the ASF dual-hosted git repository.
ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit ea76faa124a4041042c6bfaa86c8c5db2e19282f
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Tue Oct 2 18:44:20 2018 -0700
compiler: separate flags into multiple strings
This allows newt to recognize the `-O[x]` options as individual
arguments. This is required to override the optimization level
per-package.
---
compiler/arc/compiler.yml | 6 +++---
compiler/arm-none-eabi-m0/compiler.yml | 8 ++++----
compiler/arm-none-eabi-m3/compiler.yml | 10 +++++-----
compiler/arm-none-eabi-m4/compiler.yml | 10 +++++-----
compiler/arm-none-eabi-m7/compiler.yml | 10 +++++-----
compiler/mips/compiler.yml | 2 +-
compiler/riscv64/compiler.yml | 8 ++++----
compiler/sim-mips/compiler.yml | 3 +--
compiler/xc32/compiler.yml | 4 ++--
9 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/compiler/arc/compiler.yml b/compiler/arc/compiler.yml
index 9123f91..60d1989 100644
--- a/compiler/arc/compiler.yml
+++ b/compiler/arc/compiler.yml
@@ -25,9 +25,9 @@ compiler.path.objdump: arc-elf32-objdump
compiler.path.objsize: arc-elf32-size
compiler.path.objcopy: arc-elf32-objcopy
-compiler.flags.default: -mno-sdata -Wall -Werror -fno-exceptions -fomit-frame-pointer -ffunction-sections -fdata-sections
-compiler.flags.optimized: [compiler.flags.default, -Os -ggdb]
-compiler.flags.debug: [compiler.flags.default, -Og -ggdb]
+compiler.flags.default: [-mno-sdata, -Wall, -Werror, -fno-exceptions, -fomit-frame-pointer, -ffunction-sections, -fdata-sections]
+compiler.flags.optimized: [compiler.flags.default, -Os, -ggdb]
+compiler.flags.debug: [compiler.flags.default, -Og, -ggdb]
compiler.as.flags: [-x, assembler-with-cpp]
diff --git a/compiler/arm-none-eabi-m0/compiler.yml b/compiler/arm-none-eabi-m0/compiler.yml
index e47eaf1..037b26b 100644
--- a/compiler/arm-none-eabi-m0/compiler.yml
+++ b/compiler/arm-none-eabi-m0/compiler.yml
@@ -25,10 +25,10 @@ compiler.path.objdump: arm-none-eabi-objdump
compiler.path.objsize: arm-none-eabi-size
compiler.path.objcopy: arm-none-eabi-objcopy
-compiler.flags.default: -march=armv6s-m -mcpu=cortex-m0 -mthumb-interwork -mthumb -Wall -Werror -fno-exceptions -fomit-frame-pointer -ffunction-sections -fdata-sections -DCMSIS_VECTAB_VIRTUAL -DCMSIS_VECTAB_VIRTUAL_HEADER_FILE="mynewt_cm0_vectab.h"
-compiler.flags.optimized: [compiler.flags.default, -Os -ggdb]
-compiler.flags.speed: [compiler.flags.default, -O3 -ggdb]
-compiler.flags.debug: [compiler.flags.default, -Og -ggdb]
+compiler.flags.default: [-march=armv6s-m, -mcpu=cortex-m0, -mthumb-interwork, -mthumb, -Wall, -Werror, -fno-exceptions, -fomit-frame-pointer, -ffunction-sections, -fdata-sections, -DCMSIS_VECTAB_VIRTUAL, -DCMSIS_VECTAB_VIRTUAL_HEADER_FILE="mynewt_cm0_vectab.h"]
+compiler.flags.optimized: [compiler.flags.default, -Os, -ggdb]
+compiler.flags.speed: [compiler.flags.default, -O3, -ggdb]
+compiler.flags.debug: [compiler.flags.default, -Og, -ggdb]
compiler.as.flags: [-x, assembler-with-cpp]
diff --git a/compiler/arm-none-eabi-m3/compiler.yml b/compiler/arm-none-eabi-m3/compiler.yml
index 6ac8b27..1e17831 100644
--- a/compiler/arm-none-eabi-m3/compiler.yml
+++ b/compiler/arm-none-eabi-m3/compiler.yml
@@ -25,11 +25,11 @@ compiler.path.objdump: arm-none-eabi-objdump
compiler.path.objsize: arm-none-eabi-size
compiler.path.objcopy: arm-none-eabi-objcopy
-compiler.flags.base: -mcpu=cortex-m3 -mthumb-interwork -mthumb -Wall -Werror -fno-exceptions -ffunction-sections -fdata-sections
-compiler.flags.default: [compiler.flags.base, -O1 -ggdb]
-compiler.flags.optimized: [compiler.flags.base, -Os -ggdb]
-compiler.flags.speed: [compiler.flags.base, -O3 -ggdb]
-compiler.flags.debug: [compiler.flags.base, -Og -ggdb]
+compiler.flags.base: [-mcpu=cortex-m3, -mthumb-interwork, -mthumb, -Wall, -Werror, -fno-exceptions, -ffunction-sections, -fdata-sections]
+compiler.flags.default: [compiler.flags.base, -O1, -ggdb]
+compiler.flags.optimized: [compiler.flags.base, -Os, -ggdb]
+compiler.flags.speed: [compiler.flags.base, -O3, -ggdb]
+compiler.flags.debug: [compiler.flags.base, -Og, -ggdb]
compiler.as.flags: [-x, assembler-with-cpp]
diff --git a/compiler/arm-none-eabi-m4/compiler.yml b/compiler/arm-none-eabi-m4/compiler.yml
index 72c1baa..7440ad5 100644
--- a/compiler/arm-none-eabi-m4/compiler.yml
+++ b/compiler/arm-none-eabi-m4/compiler.yml
@@ -25,11 +25,11 @@ compiler.path.objdump: arm-none-eabi-objdump
compiler.path.objsize: arm-none-eabi-size
compiler.path.objcopy: arm-none-eabi-objcopy
-compiler.flags.base: -mcpu=cortex-m4 -mthumb-interwork -mthumb -Wall -Werror -fno-exceptions -ffunction-sections -fdata-sections
-compiler.flags.default: [compiler.flags.base, -O1 -ggdb]
-compiler.flags.optimized: [compiler.flags.base, -Os -ggdb]
-compiler.flags.speed: [compiler.flags.base, -O3 -ggdb]
-compiler.flags.debug: [compiler.flags.base, -Og -ggdb]
+compiler.flags.base: [-mcpu=cortex-m4, -mthumb-interwork, -mthumb, -Wall, -Werror, -fno-exceptions, -ffunction-sections, -fdata-sections]
+compiler.flags.default: [compiler.flags.base, -O1, -ggdb]
+compiler.flags.optimized: [compiler.flags.base, -Os, -ggdb]
+compiler.flags.speed: [compiler.flags.base, -O3, -ggdb]
+compiler.flags.debug: [compiler.flags.base, -Og, -ggdb]
compiler.as.flags: [-x, assembler-with-cpp]
diff --git a/compiler/arm-none-eabi-m7/compiler.yml b/compiler/arm-none-eabi-m7/compiler.yml
index ec54796..e882311 100644
--- a/compiler/arm-none-eabi-m7/compiler.yml
+++ b/compiler/arm-none-eabi-m7/compiler.yml
@@ -25,11 +25,11 @@ compiler.path.objdump: arm-none-eabi-objdump
compiler.path.objsize: arm-none-eabi-size
compiler.path.objcopy: arm-none-eabi-objcopy
-compiler.flags.base: -mcpu=cortex-m7 -mthumb-interwork -mthumb -Wall -Werror -fno-exceptions -ffunction-sections -fdata-sections
-compiler.flags.default: [compiler.flags.base, -O1 -ggdb]
-compiler.flags.optimized: [compiler.flags.base, -Os -ggdb]
-compiler.flags.speed: [compiler.flags.base, -O3 -ggdb]
-compiler.flags.debug: [compiler.flags.base, -O0 -ggdb]
+compiler.flags.base: [-mcpu=cortex-m7, -mthumb-interwork, -mthumb, -Wall, -Werror, -fno-exceptions, -ffunction-sections, -fdata-sections]
+compiler.flags.default: [compiler.flags.base, -O1, -ggdb]
+compiler.flags.optimized: [compiler.flags.base, -Os, -ggdb]
+compiler.flags.speed: [compiler.flags.base, -O3, -ggdb]
+compiler.flags.debug: [compiler.flags.base, -O0, -ggdb]
compiler.as.flags: [-x, assembler-with-cpp]
diff --git a/compiler/mips/compiler.yml b/compiler/mips/compiler.yml
index 0769bb0..bacecee 100644
--- a/compiler/mips/compiler.yml
+++ b/compiler/mips/compiler.yml
@@ -24,7 +24,7 @@ compiler.path.objdump: "mips-mti-elf-objdump"
compiler.path.objsize: "mips-mti-elf-size"
compiler.path.objcopy: "mips-mti-elf-objcopy"
-compiler.flags.base: -std=gnu11 -EL -mips32r2 -Wall -Werror
+compiler.flags.base: [-std=gnu11, -EL, -mips32r2, -Wall, -Werror]
compiler.flags.default: [compiler.flags.base, -O2, -g]
compiler.flags.optimized: [compiler.flags.base, -Os, -g]
compiler.flags.debug: [compiler.flags.base, -g3]
diff --git a/compiler/riscv64/compiler.yml b/compiler/riscv64/compiler.yml
index 9c01237..1c1777f 100644
--- a/compiler/riscv64/compiler.yml
+++ b/compiler/riscv64/compiler.yml
@@ -24,10 +24,10 @@ compiler.path.objdump: "riscv64-unknown-elf-objdump"
compiler.path.objsize: "riscv64-unknown-elf-size"
compiler.path.objcopy: "riscv64-unknown-elf-objcopy"
-compiler.flags.base: -std=gnu11 -Wall -Werror -Wno-format-truncation -ffunction-sections -fdata-sections -fno-builtin-printf
-compiler.flags.default: [compiler.flags.base, -O1 -ggdb]
-compiler.flags.optimized: [compiler.flags.base, -Os -ggdb]
-compiler.flags.debug: [compiler.flags.base, -Og -ggdb]
+compiler.flags.base: [-std=gnu11, -Wall, -Werror, -Wno-format-truncation, -ffunction-sections, -fdata-sections, -fno-builtin-printf]
+compiler.flags.default: [compiler.flags.base, -O1, -ggdb]
+compiler.flags.optimized: [compiler.flags.base, -Os, -ggdb]
+compiler.flags.debug: [compiler.flags.base, -Og, -ggdb]
compiler.as.flags: [-x assembler-with-cpp]
diff --git a/compiler/sim-mips/compiler.yml b/compiler/sim-mips/compiler.yml
index 9aff76e..d8e814f23 100644
--- a/compiler/sim-mips/compiler.yml
+++ b/compiler/sim-mips/compiler.yml
@@ -24,8 +24,7 @@ compiler.path.archive: "mips-mti-linux-gnu-ar"
compiler.path.objdump: "mips-mti-linux-gnu-objdump"
compiler.path.objsize: "mips-mti-linux-gnu-size"
compiler.path.objcopy: "mips-mti-linux-gnu-objcopy"
-compiler.flags.base: >
- -std=gnu11 -EL -mips32r2 -Wall -Werror -ggdb
+compiler.flags.base: [-std=gnu11, -EL, -mips32r2, -Wall, -Werror, -ggdb]
compiler.ld.resolve_circular_deps: true
compiler.flags.default: [compiler.flags.base, -O1]
diff --git a/compiler/xc32/compiler.yml b/compiler/xc32/compiler.yml
index fcd4a91..7cfbd24 100644
--- a/compiler/xc32/compiler.yml
+++ b/compiler/xc32/compiler.yml
@@ -24,9 +24,9 @@ compiler.path.objdump: "xc32-objdump"
compiler.path.objsize: "xc32-size"
compiler.path.objcopy: "xc32-objcopy"
-compiler.flags.base: -std=gnu11 -msmart-io=0
+compiler.flags.base: [-std=gnu11, -msmart-io=0]
compiler.flags.default: [compiler.flags.base, -O2, -g3]
-compiler.flags.optimized: [compiler.flags.base, -Os -g3]
+compiler.flags.optimized: [compiler.flags.base, -Os, -g3]
compiler.flags.debug: [compiler.flags.base, -g3]
compiler.as.flags: [-x, assembler-with-cpp]