summaryrefslogtreecommitdiff
path: root/os/src/sbrk.c
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-28 03:58:51 +0100
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-28 04:02:11 +0100
commit608f796648e8de74f9aac3e60db3f7d87e69e9f4 (patch)
tree2966b76b8d12e23f99c8fbd13aeccbb4d4ef8ce8 /os/src/sbrk.c
parent18d53779c4fef3efca606aead2da3af40ec76332 (diff)
Work on the MPU port. The exception VTOR redirection doesn't work as expected.
Diffstat (limited to 'os/src/sbrk.c')
-rw-r--r--os/src/sbrk.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/os/src/sbrk.c b/os/src/sbrk.c
index 4085970..bff44a2 100644
--- a/os/src/sbrk.c
+++ b/os/src/sbrk.c
@@ -11,14 +11,15 @@
// Mostly stolen from mbed-freertos
extern uintptr_t __heap_start, __heap_end;
-extern uintptr_t __stack_start __attribute__((weak));
+//extern uintptr_t __stack_start;
/* Low-level bulk RAM allocator -- used by Newlib's Malloc */
static void *heap_end = NULL;
PRIVILEGED_FUNCTION void *_sbrk_r(struct _reent *ptr, ptrdiff_t incr)
{
void *prev_heap_end, *next_heap_end, *ret;
- void *stack_min = (void *)(__stack_start ? __stack_start : __heap_end);
+// void *stack_min = (void *)(__stack_start ? __stack_start : __heap_end);
+ void *stack_min = (void *)__heap_end;
DBGOUT("_sbrk_r(%p, %u)\r\n", ptr, incr);