commit 88bff5c945f719a3ae57647e40dfe8f4c6abe2e7
author Alexei Frolov <frolv@google.com> Wed Jun 17 10:13:16 2020 -0700
committer CQ Bot Account <commit-bot@chromium.org> Wed Jun 17 17:47:16 2020 +0000
tree 346cf12cf8e1b6b0ffea80d8cb4e11f5658853a3
parent 86003203b79fca6ecc2c28af7b499a0373df0833

pw_toolchain: Define ARM asmflags

Before the toolchain refactor, assembler flags were being set through
string interpolation from invoker.toolchain_cflags rather than GN's
builtin asmflags option. Because of this, no Pigweed toolchain
definitions specified their asmflags. With the refactor, this
interpolation was removed, preventing assembler flags from being set
altogether. This change updates the ARM toolchains to specify their
lists of asmflags so that they are properly set.

Change-Id: Iba5f12dc1b602e0b0b8517901beb2447304cb912

pw_toolchain/arm_gcc/BUILD.gn

diff --git a/pw_toolchain/arm_gcc/BUILD.gn b/pw_toolchain/arm_gcc/BUILD.gn
index 1379131..1c4eef0 100644
--- a/pw_toolchain/arm_gcc/BUILD.gn
+++ b/pw_toolchain/arm_gcc/BUILD.gn
@@ -33,13 +33,15 @@
 }
 
 config("cortex_common") {
-  cflags = [
+  asmflags = [
     "-mabi=aapcs",
     "-mthumb",
-    "-specs=nano.specs",
-    "-specs=nosys.specs",
-    "-u_printf_float",
   ]
+  cflags = asmflags + [
+             "-specs=nano.specs",
+             "-specs=nosys.specs",
+             "-u_printf_float",
+           ]
   ldflags = cflags + [
               "-lnosys",
               "-lc",
@@ -48,16 +50,19 @@
 
 config("cortex_m3") {
   cflags = [ "-mcpu=cortex-m3" ]
+  asmflags = cflags
   ldflags = cflags
 }
 
 config("cortex_m4") {
   cflags = [ "-mcpu=cortex-m4" ]
+  asmflags = cflags
   ldflags = cflags
 }
 
 config("cortex_software_fpu") {
   cflags = [ "-mfloat-abi=soft" ]
+  asmflags = cflags
   ldflags = cflags
 }
 
@@ -66,6 +71,7 @@
     "-mfloat-abi=hard",
     "-mfpu=fpv4-sp-d16",
   ]
+  asmflags = cflags
   defines = [ "PW_ARMV7M_ENABLE_FPU=1" ]
   ldflags = cflags
 }