jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

lpc43xx: Clean up linker script breakage from merge

Browse Source
This commit is contained in:
Ben Gamari 2013-07-02 07:34:46 -04:00 committed by Piotr Esden-Tempski
parent 580be39e47
commit 994e679fb8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/lpc43xx/m4/libopencm3_lpc43xx.ld
View File

@ -73,6 +73,8 @@ SECTIONS
.ARM.extab : { .ARM.extab : {
*(.ARM.extab*) *(.ARM.extab*)
} >rom } >rom
/* exception index - required due to libgcc.a issuing /0 exceptions */
.ARM.exidx : { .ARM.exidx : {
__exidx_start = .; __exidx_start = .;
*(.ARM.exidx*) *(.ARM.exidx*)
@ -105,14 +107,11 @@ SECTIONS
_ebss = .; _ebss = .;
} >ram_local2 } >ram_local2
<<<<<<< HEAD
=======
/* exception unwind data - required due to libgcc.a issuing /0 exceptions */ /* exception unwind data - required due to libgcc.a issuing /0 exceptions */
.ARM.extab : { .ARM.extab : {
*(.ARM.extab*) *(.ARM.extab*)
} >ram_local2 } >ram_local2
>>>>>>> bba3412... Changed ldscripts to use new RAM region names, placed .data/.bss/stack into separate local RAM region.
/* /*
* The .eh_frame section appears to be used for C++ exception handling. * The .eh_frame section appears to be used for C++ exception handling.
* You may need to fix this if you're using C++. * You may need to fix this if you're using C++.

2
lib/lpc43xx/m4/libopencm3_lpc43xx_rom_to_ram.ld
View File

@ -74,6 +74,8 @@ SECTIONS
.ARM.extab : { .ARM.extab : {
*(.ARM.extab*) *(.ARM.extab*)
} >rom } >rom
/* exception index - required due to libgcc.a issuing /0 exceptions */
.ARM.exidx : { .ARM.exidx : {
__exidx_start = .; __exidx_start = .;
*(.ARM.exidx*) *(.ARM.exidx*)