Ensure compiles using latest Yagarto.

This commit is contained in:
Richard Barry 2009-09-29 19:32:27 +00:00
parent a961f6daa3
commit 1f12f80eb7
3 changed files with 6 additions and 5 deletions

View File

@ -58,7 +58,7 @@ LDSCRIPT=lpc2368.ld
LINKER_FLAGS=-mthumb -nostartfiles -Xlinker -oRTOSDemo.elf -Xlinker -M -Xlinker -Map=rtosdemo.map LINKER_FLAGS=-mthumb -nostartfiles -Xlinker -oRTOSDemo.elf -Xlinker -M -Xlinker -Map=rtosdemo.map
DEBUG=-g DEBUG=-g
OPTIM=-O1 OPTIM=-O0
CFLAGS= $(DEBUG) \ CFLAGS= $(DEBUG) \
@ -76,7 +76,9 @@ CFLAGS= $(DEBUG) \
-D PACK_STRUCT_END=__attribute\(\(packed\)\) \ -D PACK_STRUCT_END=__attribute\(\(packed\)\) \
-D ALIGN_STRUCT_END=__attribute\(\(aligned\(4\)\)\) \ -D ALIGN_STRUCT_END=__attribute\(\(aligned\(4\)\)\) \
-fomit-frame-pointer \ -fomit-frame-pointer \
-mthumb-interwork -mthumb-interwork \
-fno-dwarf2-cfi-asm \
-fno-strict-aliasing
THUMB_SOURCE= \ THUMB_SOURCE= \
main.c \ main.c \

View File

@ -41,7 +41,6 @@ SECTIONS
*(.bss) *(.bss)
} >ram } >ram
/* Align here to ensure that the .bss section occupies space up to /* Align here to ensure that the .bss section occupies space up to
_end. Align after .bss to ensure correct alignment even if the _end. Align after .bss to ensure correct alignment even if the
.bss section disappears because there are no input sections. */ .bss section disappears because there are no input sections. */

View File

@ -101,11 +101,11 @@ int _close_r (struct _reent *r, int file)
/***************************************************************************/ /***************************************************************************/
/* Register name faking - works in collusion with the linker. */ /* Register name faking - works in collusion with the linker. */
register char * stack_ptr asm ("sp"); register char * stack_ptr __asm ("sp");
caddr_t _sbrk_r (struct _reent *r, int incr) caddr_t _sbrk_r (struct _reent *r, int incr)
{ {
extern char end asm ("end"); /* Defined by the linker. */ extern char end __asm ("end"); /* Defined by the linker. */
static char * heap_end; static char * heap_end;
char * prev_heap_end; char * prev_heap_end;