From e60ce9946442eb2b6632bf7a4cdd61f3aa907ace Mon Sep 17 00:00:00 2001
From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Tue, 29 Sep 2009 19:32:27 +0000
Subject: [PATCH] Ensure compiles using latest Yagarto.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@873 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 Demo/ARM7_LPC2368_Eclipse/RTOSDemo/Makefile   | 6 ++++--
 Demo/ARM7_LPC2368_Eclipse/RTOSDemo/lpc2368.ld | 1 -
 Demo/ARM7_LPC2368_Eclipse/RTOSDemo/syscalls.c | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/Makefile b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/Makefile
index e6d95ec0f..bf79f0709 100644
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/Makefile
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/Makefile
@@ -58,7 +58,7 @@ LDSCRIPT=lpc2368.ld
 LINKER_FLAGS=-mthumb -nostartfiles -Xlinker -oRTOSDemo.elf -Xlinker -M -Xlinker -Map=rtosdemo.map
 
 DEBUG=-g
-OPTIM=-O1
+OPTIM=-O0
 
 
 CFLAGS= $(DEBUG) \
@@ -76,7 +76,9 @@ CFLAGS= $(DEBUG) \
 		-D PACK_STRUCT_END=__attribute\(\(packed\)\) \
 		-D ALIGN_STRUCT_END=__attribute\(\(aligned\(4\)\)\) \
 		-fomit-frame-pointer \
-		-mthumb-interwork
+		-mthumb-interwork \
+		-fno-dwarf2-cfi-asm \
+		-fno-strict-aliasing
 		
 THUMB_SOURCE= \
 		main.c \
diff --git a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/lpc2368.ld b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/lpc2368.ld
index f447e1601..f15d232ea 100644
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/lpc2368.ld
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/lpc2368.ld
@@ -41,7 +41,6 @@ SECTIONS
 		*(.bss)
 	} >ram
 
-	
 	/* Align here to ensure that the .bss section occupies space up to
 	_end.  Align after .bss to ensure correct alignment even if the
 	.bss section disappears because there are no input sections.  */
diff --git a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/syscalls.c b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/syscalls.c
index 5dff88128..ac8ddeb66 100644
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/syscalls.c
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/syscalls.c
@@ -101,11 +101,11 @@ int _close_r (struct _reent *r, int file)
 /***************************************************************************/
 
 /* 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)
 {
-  extern char   end asm ("end"); /* Defined by the linker.  */
+  extern char   end __asm ("end"); /* Defined by the linker.  */
   static char * heap_end;
   char *        prev_heap_end;
 
-- 
2.39.5