From 3eb264f5b9653764e690af7450e09b5de92dfd2a Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Fri, 27 Mar 2015 10:27:41 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7817
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s | 2 +-
 os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s | 2 +-
 os/common/ports/ARMCMx/compilers/GCC/rules.ld   | 5 +++--
 os/common/ports/ARMCMx/compilers/GCC/vectors.c  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'os/common/ports/ARMCMx/compilers')

diff --git a/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s b/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
index 38b4513b7..d395eee85 100644
--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
+++ b/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
@@ -108,7 +108,7 @@
                 .fpu    softvfp
 
                 .thumb
-                .text
+                .section .startup
 
 /*
  * Reset handler.
diff --git a/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s b/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
index fcfa4decd..be04334be 100644
--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
+++ b/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
@@ -148,7 +148,7 @@
 #endif
 
                 .thumb
-                .text
+                .section .startup
 
 /*
  * Reset handler.
diff --git a/os/common/ports/ARMCMx/compilers/GCC/rules.ld b/os/common/ports/ARMCMx/compilers/GCC/rules.ld
index ccc52da5d..d48fb6112 100644
--- a/os/common/ports/ARMCMx/compilers/GCC/rules.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/rules.ld
@@ -51,7 +51,7 @@ SECTIONS
 
     startup : ALIGN(16) SUBALIGN(16)
     {
-        KEEP(*(vectors))
+        KEEP(*(.vectors))
     } > flash
 
     constructors : ALIGN(4) SUBALIGN(4)
@@ -72,7 +72,8 @@ SECTIONS
 
     .text : ALIGN(16) SUBALIGN(16)
     {
-        *(.text.startup.*)
+        *(.startup)
+        *(.startup.*)
         *(.text)
         *(.text.*)
         *(.rodata)
diff --git a/os/common/ports/ARMCMx/compilers/GCC/vectors.c b/os/common/ports/ARMCMx/compilers/GCC/vectors.c
index d67d4171b..a9bf5ae6a 100644
--- a/os/common/ports/ARMCMx/compilers/GCC/vectors.c
+++ b/os/common/ports/ARMCMx/compilers/GCC/vectors.c
@@ -462,7 +462,7 @@ void Vector3FC(void) __attribute__((weak, alias("_unhandled_exception")));
  * @brief   STM32 vectors table.
  */
 #if !defined(__DOXYGEN__)
-__attribute__ ((used, section("vectors")))
+__attribute__ ((used, section(".vectors")))
 #endif
 /*lint -save -e9075 [8.4] All symbols are invoked from asm context.*/
 vectors_t _vectors = {
-- 
cgit v1.2.3