You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2015/11/11 23:48:29 UTC

incubator-mynewt-larva git commit: Stop bringing in exception unwind code from libgcc.

Repository: incubator-mynewt-larva
Updated Branches:
  refs/heads/master 218fb4862 -> 6f952b463


Stop bringing in exception unwind code from libgcc.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/6f952b46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/6f952b46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/6f952b46

Branch: refs/heads/master
Commit: 6f952b463683fe057548427387f9483238ad8650
Parents: 218fb48
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Wed Nov 11 14:46:13 2015 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Wed Nov 11 14:46:13 2015 -0800

----------------------------------------------------------------------
 compiler/arm-none-eabi-m4/compiler.yml  | 2 +-
 libs/os/src/arch/cortex_m4/m4/HAL_CM4.s | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/6f952b46/compiler/arm-none-eabi-m4/compiler.yml
----------------------------------------------------------------------
diff --git a/compiler/arm-none-eabi-m4/compiler.yml b/compiler/arm-none-eabi-m4/compiler.yml
index 0927c3b..8cde544 100644
--- a/compiler/arm-none-eabi-m4/compiler.yml
+++ b/compiler/arm-none-eabi-m4/compiler.yml
@@ -22,7 +22,7 @@ compiler.path.objsize: arm-none-eabi-size
 compiler.path.objcopy: arm-none-eabi-objcopy
 
 
-compiler.flags.default: -mcpu=cortex-m4 -mthumb-interwork -mthumb -Wall -Werror
+compiler.flags.default: -mcpu=cortex-m4 -mthumb-interwork -mthumb -Wall -Werror -fno-exceptions
 compiler.flags.optimized: [compiler.flags.default, -Os -ggdb] 
 compiler.flags.debug: [compiler.flags.default, -O1 -ggdb]
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/6f952b46/libs/os/src/arch/cortex_m4/m4/HAL_CM4.s
----------------------------------------------------------------------
diff --git a/libs/os/src/arch/cortex_m4/m4/HAL_CM4.s b/libs/os/src/arch/cortex_m4/m4/HAL_CM4.s
index 2db3790..dcde207 100755
--- a/libs/os/src/arch/cortex_m4/m4/HAL_CM4.s
+++ b/libs/os/src/arch/cortex_m4/m4/HAL_CM4.s
@@ -225,6 +225,12 @@ os_default_irq_asm:
         .fnend
         .size   os_default_irq_asm, .-os_default_irq_asm
 
+	/*
+	 * Prevent libgcc unwind stuff from getting pulled in.
+	 */
+        .section ".data"
+	.global __aeabi_unwind_cpp_pr0
+__aeabi_unwind_cpp_pr0:
         .end
 
 /*----------------------------------------------------------------------------