From 5ababb428ed64df5b7831687a6ad7f9dec5655a6 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 13 Oct 2012 11:01:46 +0000 Subject: [PATCH] Fixed bug 3576771. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4758 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/various/syscalls.c | 5 +++++ readme.txt | 2 ++ 2 files changed, 7 insertions(+) diff --git a/os/various/syscalls.c b/os/various/syscalls.c index 7cc98b5ea..252028c7f 100644 --- a/os/various/syscalls.c +++ b/os/various/syscalls.c @@ -133,6 +133,7 @@ int _close_r(struct _reent *r, int file) caddr_t _sbrk_r(struct _reent *r, int incr) { +#if CH_USE_MEMCORE void *p; chDbgCheck(incr > 0, "_sbrk_r"); @@ -144,6 +145,10 @@ caddr_t _sbrk_r(struct _reent *r, int incr) return (caddr_t)-1; } return (caddr_t)p; +#else + __errno_r(r) = ENOMEM; + return (caddr_t)-1; +#endif } /***************************************************************************/ diff --git a/readme.txt b/readme.txt index 9a6f333a5..307d9d800 100644 --- a/readme.txt +++ b/readme.txt @@ -83,6 +83,8 @@ ***************************************************************************** *** 2.5.1 *** +- FIX: Fixed compilation issue in syscalls.c (bug 3576771)(backported + to 2.4.3). - FIX: Fixed Typos in STM32F0xx EXT driver (bug 3576193). - FIX: Fixed STM32F10X_CL: Wrong CAN1 interrupt number definitions (bug 3575766).