From 2d843eda5c96e4f96760c621840ab9f50aec99bd Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM) Date: Mon, 8 Aug 2011 08:39:59 +0800 Subject: companion patch to 3da40837f44584e84a10f90291dcecfe613b9618 The original patch from Nicolas Schodet didn't apply cleanly. Manually fixed up Makefile and nxt.ld --- AT91SAM7S256/SAM7S256/gcc/Makefile | 2 +- AT91SAM7S256/SAM7S256/gcc/nxt.ld | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'AT91SAM7S256/SAM7S256') diff --git a/AT91SAM7S256/SAM7S256/gcc/Makefile b/AT91SAM7S256/SAM7S256/gcc/Makefile index 734e0af..be41a61 100644 --- a/AT91SAM7S256/SAM7S256/gcc/Makefile +++ b/AT91SAM7S256/SAM7S256/gcc/Makefile @@ -15,7 +15,7 @@ THUMB_SOURCES = c_button.c c_cmd.c c_comm.c c_display.c c_input.c c_ioctrl.c \ d_ioctrl.c d_loader.c d_lowspeed.c d_output.c d_sound.c \ d_timer.c d_usb.c \ m_sched.c \ - errno.c sbrk.c strtod.c sscanf.c \ + abort.c errno.c sbrk.c strtod.c sscanf.c \ Cstartup_SAM7.c ASM_ARM_SOURCE = Cstartup.S undef_handler.S debug_hexutils.S debug_stub.S debug_comm.S debug_runlooptasks.S diff --git a/AT91SAM7S256/SAM7S256/gcc/nxt.ld b/AT91SAM7S256/SAM7S256/gcc/nxt.ld index 3b2c7a3..7b5a9e2 100644 --- a/AT91SAM7S256/SAM7S256/gcc/nxt.ld +++ b/AT91SAM7S256/SAM7S256/gcc/nxt.ld @@ -51,6 +51,13 @@ SECTIONS PROVIDE(__dtors_end__ = .); } >CODE + __exidx_start = . ; + .ARM.exidx : + { + *(.ARM.exidx* .gnu.linkonce.armexidx.*) + } >CODE + __exidx_end = . ; + . = ALIGN(4); _etext = . ; -- cgit v1.2.3