From 3f4ec3cf44a07a5670a3e195dc9d52bd0762cc71 Mon Sep 17 00:00:00 2001 From: bg- Date: Mon, 21 May 2007 15:29:46 +0000 Subject: [PATCH] * Use _end rather than nonstandard __bss_end. --- cpu/msp430/msp430.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cpu/msp430/msp430.c b/cpu/msp430/msp430.c index 3efd7d7be..2b2f63fe9 100644 --- a/cpu/msp430/msp430.c +++ b/cpu/msp430/msp430.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: msp430.c,v 1.5 2007/03/15 21:47:45 adamdunkels Exp $ + * @(#)$Id: msp430.c,v 1.6 2007/05/21 15:29:46 bg- Exp $ */ #include #include @@ -148,8 +148,9 @@ init_ports(void) P2IE = 0; } /*---------------------------------------------------------------------------*/ -/* __bss_end is int but msp430-ld may align it incorrectly. Fix below. */ -static char *cur_break = (char *)(&__bss_end + 1); +/* msp430-ld may align _end incorrectly. Workaround in cpu_init. */ +extern int _end; /* Not in sys/unistd.h */ +static char *cur_break = (char *)&_end; void msp430_cpu_init(void)