libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[BSP] Fix the compiling issue with GCC6

This commit is contained in:
Bernard Xiong 2018-08-04 14:59:29 +08:00
parent 7cb670b205
commit fcab0f2cb4
6 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bsp/lm3s8962/Libraries/startup/gcc/start_gcc.S
View File

@ -1,9 +1,4 @@
.section .bss.init .syntax unified
.equ Stack_Size, 0x00000200
.space Stack_Size
Initial_spTop:
.syntax unified
.cpu cortex-m3 .cpu cortex-m3
.fpu softvfp .fpu softvfp
.thumb .thumb
@ -32,13 +27,13 @@ defined in linker script */
* @retval : None * @retval : None
*/ */
.section .text.Reset_Handler .section .text.Reset_Handler
.weak Reset_Handler .weak Reset_Handler
.type Reset_Handler, %function .type Reset_Handler, %function
Reset_Handler: Reset_Handler:
/* restore original stack pointer */ /* restore original stack pointer */
LDR r0, =Initial_spTop ldr sp, =_estack /* set stack pointer */
MSR msp, r0
/* Copy the data segment initializers from flash to SRAM */ /* Copy the data segment initializers from flash to SRAM */
movs r1, #0 movs r1, #0
b LoopCopyDataInit b LoopCopyDataInit
@ -98,7 +93,7 @@ Infinite_Loop:
g_pfnVectors: g_pfnVectors:
.word Initial_spTop .word _estack
.word Reset_Handler .word Reset_Handler
.word Default_Handler //NMI_Handler .word Default_Handler //NMI_Handler
.word HardFault_Handler .word HardFault_Handler

11
bsp/lm3s8962/lm3s_rom.ld
View File

@ -10,6 +10,7 @@ MEMORY
DATA (rw) : ORIGIN = 0x20000000, LENGTH = 0x00010000 DATA (rw) : ORIGIN = 0x20000000, LENGTH = 0x00010000
} }
ENTRY(Reset_Handler) ENTRY(Reset_Handler)
_system_stack_size = 0x200;
SECTIONS SECTIONS
{ {
@ -72,6 +73,13 @@ SECTIONS
_edata = . ; _edata = . ;
} >DATA } >DATA
.stack :
{
. = . + _system_stack_size;
. = ALIGN(4);
_estack = .;
} >DATA
__bss_start = .; __bss_start = .;
.bss : .bss :
{ {
@ -85,9 +93,6 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
/* This is used by the startup in order to initialize the .bss secion */ /* This is used by the startup in order to initialize the .bss secion */
_ebss = . ; _ebss = . ;
_estack = .;
*(.bss.init)
} > DATA } > DATA
__bss_end = .; __bss_end = .;

15
bsp/lm3s9b9x/Libraries/startup/gcc/start_gcc.S
View File

@ -1,9 +1,4 @@
.section .bss.init .syntax unified
.equ Stack_Size, 0x00000200
.space Stack_Size
Initial_spTop:
.syntax unified
.cpu cortex-m3 .cpu cortex-m3
.fpu softvfp .fpu softvfp
.thumb .thumb
@ -32,13 +27,13 @@ defined in linker script */
* @retval : None * @retval : None
*/ */
.section .text.Reset_Handler .section .text.Reset_Handler
.weak Reset_Handler .weak Reset_Handler
.type Reset_Handler, %function .type Reset_Handler, %function
Reset_Handler: Reset_Handler:
/* restore original stack pointer */ /* restore original stack pointer */
LDR r0, =Initial_spTop ldr sp, =_estack /* set stack pointer */
MSR msp, r0
/* Copy the data segment initializers from flash to SRAM */ /* Copy the data segment initializers from flash to SRAM */
movs r1, #0 movs r1, #0
b LoopCopyDataInit b LoopCopyDataInit
@ -98,7 +93,7 @@ Infinite_Loop:
g_pfnVectors: g_pfnVectors:
.word Initial_spTop .word _estack
.word Reset_Handler .word Reset_Handler
.word Default_Handler //NMI_Handler .word Default_Handler //NMI_Handler
.word HardFault_Handler .word HardFault_Handler

11
bsp/lm3s9b9x/lm3s_rom.ld
View File

@ -10,6 +10,7 @@ MEMORY
DATA (rw) : ORIGIN = 0x20000000, LENGTH = 0x00010000 DATA (rw) : ORIGIN = 0x20000000, LENGTH = 0x00010000
} }
ENTRY(Reset_Handler) ENTRY(Reset_Handler)
_system_stack_size = 0x200;
SECTIONS SECTIONS
{ {
@ -72,6 +73,13 @@ SECTIONS
_edata = . ; _edata = . ;
} >DATA } >DATA
.stack :
{
. = . + _system_stack_size;
. = ALIGN(4);
_estack = .;
} >DATA
__bss_start = .; __bss_start = .;
.bss : .bss :
{ {
@ -85,9 +93,6 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
/* This is used by the startup in order to initialize the .bss secion */ /* This is used by the startup in order to initialize the .bss secion */
_ebss = . ; _ebss = . ;
_estack = .;
*(.bss.init)
} > DATA } > DATA
__bss_end = .; __bss_end = .;

20
bsp/mb9bf500r/CMSIS/start_gcc.S
View File

@ -12,12 +12,7 @@
* 2011-07-01 lgnq first version * 2011-07-01 lgnq first version
*/ */
.section .bss.init .syntax unified
.equ Stack_Size, 0x00000200
.space Stack_Size
Initial_spTop:
.syntax unified
.cpu cortex-m3 .cpu cortex-m3
.fpu softvfp .fpu softvfp
.thumb .thumb
@ -48,13 +43,13 @@ defined in linker script */
* @retval : None * @retval : None
*/ */
.section .text.Reset_Handler .section .text.Reset_Handler
.weak Reset_Handler .weak Reset_Handler
.type Reset_Handler, %function .type Reset_Handler, %function
Reset_Handler: Reset_Handler:
/* restore original stack pointer */ /* restore original stack pointer */
LDR r0, =Initial_spTop ldr sp, =_estack /* set stack pointer */
MSR msp, r0
/* Copy the data segment initializers from flash to SRAM */ /* Copy the data segment initializers from flash to SRAM */
movs r1, #0 movs r1, #0
b LoopCopyDataInit b LoopCopyDataInit
@ -107,13 +102,12 @@ Infinite_Loop:
* 0x0000.0000. * 0x0000.0000.
* *
******************************************************************************/ ******************************************************************************/
.section .isr_vector,"a",%progbits .section .isr_vector,"a",%progbits
.type g_pfnVectors, %object .type g_pfnVectors, %object
.size g_pfnVectors, .-g_pfnVectors .size g_pfnVectors, .-g_pfnVectors
g_pfnVectors: g_pfnVectors:
.word Initial_spTop .word _estack
.word Reset_Handler .word Reset_Handler
.word NMI_Handler .word NMI_Handler
.word HardFault_Handler .word HardFault_Handler

11
bsp/mb9bf500r/fm3_rom.ld
View File

@ -5,6 +5,7 @@ MEMORY
DATA (rw) : ORIGIN = 0x1FFFC000, LENGTH = 0x0000C000 DATA (rw) : ORIGIN = 0x1FFFC000, LENGTH = 0x0000C000
} }
ENTRY(Reset_Handler) ENTRY(Reset_Handler)
_system_stack_size = 0x200;
SECTIONS SECTIONS
{ {
@ -70,6 +71,13 @@ SECTIONS
_edata = . ; _edata = . ;
} >DATA } >DATA
.stack :
{
. = . + _system_stack_size;
. = ALIGN(4);
_estack = .;
} >DATA
__bss_start = .; __bss_start = .;
.bss : .bss :
{ {
@ -84,9 +92,6 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
/* This is used by the startup in order to initialize the .bss secion */ /* This is used by the startup in order to initialize the .bss secion */
_ebss = . ; _ebss = . ;
_estack = .;
*(.bss.init)
} > DATA } > DATA
__bss_end = .; __bss_end = .;