From 994e679fb8a6c12e35650965f6553a931c6cf00c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 2 Jul 2013 07:34:46 -0400 Subject: [PATCH] lpc43xx: Clean up linker script breakage from merge --- lib/lpc43xx/m4/libopencm3_lpc43xx.ld | 5 ++--- lib/lpc43xx/m4/libopencm3_lpc43xx_rom_to_ram.ld | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/lpc43xx/m4/libopencm3_lpc43xx.ld b/lib/lpc43xx/m4/libopencm3_lpc43xx.ld index 067dc7e9..c289b351 100644 --- a/lib/lpc43xx/m4/libopencm3_lpc43xx.ld +++ b/lib/lpc43xx/m4/libopencm3_lpc43xx.ld @@ -73,6 +73,8 @@ SECTIONS .ARM.extab : { *(.ARM.extab*) } >rom + + /* exception index - required due to libgcc.a issuing /0 exceptions */ .ARM.exidx : { __exidx_start = .; *(.ARM.exidx*) @@ -105,14 +107,11 @@ SECTIONS _ebss = .; } >ram_local2 -<<<<<<< HEAD -======= /* exception unwind data - required due to libgcc.a issuing /0 exceptions */ .ARM.extab : { *(.ARM.extab*) } >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. * You may need to fix this if you're using C++. diff --git a/lib/lpc43xx/m4/libopencm3_lpc43xx_rom_to_ram.ld b/lib/lpc43xx/m4/libopencm3_lpc43xx_rom_to_ram.ld index 50be8d3d..461ed45c 100644 --- a/lib/lpc43xx/m4/libopencm3_lpc43xx_rom_to_ram.ld +++ b/lib/lpc43xx/m4/libopencm3_lpc43xx_rom_to_ram.ld @@ -74,6 +74,8 @@ SECTIONS .ARM.extab : { *(.ARM.extab*) } >rom + + /* exception index - required due to libgcc.a issuing /0 exceptions */ .ARM.exidx : { __exidx_start = .; *(.ARM.exidx*)