From a82dec52e68b99553e1793f46e49e297f03df635 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 26 Jan 2013 10:40:00 +0000 Subject: [PATCH] Fixed bug 3601621. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5091 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/Posix-GCC/Makefile | 4 ++-- demos/Posix-GCC/main.c | 2 ++ demos/Win32-MinGW/Makefile | 4 ++-- readme.txt | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/demos/Posix-GCC/Makefile b/demos/Posix-GCC/Makefile index f5eae1c05..5d77f6a8e 100644 --- a/demos/Posix-GCC/Makefile +++ b/demos/Posix-GCC/Makefile @@ -132,10 +132,10 @@ CPFLAGS += -MD -MP -MF .dep/$(@F).d all: $(OBJS) $(PROJECT) -%o : %c +%.o : %.c $(CC) -c $(CPFLAGS) -I . $(INCDIR) $< -o $@ -%o : %s +%.o : %.s $(AS) -c $(ASFLAGS) $< -o $@ $(PROJECT): $(OBJS) diff --git a/demos/Posix-GCC/main.c b/demos/Posix-GCC/main.c index 7514faebf..d4ed8f9c8 100644 --- a/demos/Posix-GCC/main.c +++ b/demos/Posix-GCC/main.c @@ -18,6 +18,8 @@ along with this program. If not, see . */ +#include + #include "ch.h" #include "hal.h" #include "test.h" diff --git a/demos/Win32-MinGW/Makefile b/demos/Win32-MinGW/Makefile index 73e938d44..1b77c241c 100644 --- a/demos/Win32-MinGW/Makefile +++ b/demos/Win32-MinGW/Makefile @@ -117,10 +117,10 @@ CPFLAGS += -MD -MP -MF .dep/$(@F).d all: $(OBJS) $(PROJECT).exe -%o : %c +%.o : %.c $(CC) -c $(CPFLAGS) -I . $(INCDIR) $< -o $@ -%o : %s +%.o : %.s $(AS) -c $(ASFLAGS) $< -o $@ %exe: $(OBJS) diff --git a/readme.txt b/readme.txt index ac803932a..ec6d26d47 100644 --- a/readme.txt +++ b/readme.txt @@ -82,6 +82,8 @@ ***************************************************************************** *** 2.5.2 *** +- FIX: Fixed compile errors in Posix-GCC demo (bug 3601621)(backported + to 2.4.4). - FIX: Fixed state checker error in MSP430 port (bug 3601460)(backported to 2.4.4). - FIX: Fixed wrong assertion in UART driver (bug 3600789)(backported