Updates to work with mspgcc 20110716 and subsequent releases

Signed-off-by: Joakim Eriksson <joakime@sics.se>

tests/cputest.c

@@ -38,10 +38,17 @@
  */
 
 #include "msp430setup.h"
-#include <signal.h>
 #include <stdio.h>
 #include <string.h>
+#if __MSPGCC__
+#include <msp430.h>
+#include <legacymsp430.h>
+#define eint() __eint()
+#define dint() __dint()
+#else /* __MSPGCC__ */
+#include <signal.h>
 #include <io.h>
+#endif /* __MSPGCC__ */
 
 /* From Adams test-suite */
 #define TEST(...) if(__VA_ARGS__) {					 \
@@ -211,7 +218,6 @@ static struct {
 				     crashed gcc... */
 } invert;
 
-#include <io.h>
 #ifndef BV
 #define BV(n) (1 << (n))
 #endif

tests/msp430setup.c

@@ -37,10 +37,17 @@
  */
 
 #include "msp430setup.h"
+#if __MSPGCC__
+#include <msp430.h>
+#include <msp430libc.h>
+#include <legacymsp430.h>
+#include <sys/crtld.h>
+#else /* __MSPGCC__ */
 #include <io.h>
 #include <signal.h>
-#include <stdio.h>
 #include <sys/unistd.h>
+#endif /* __MSPGCC__ */
+#include <stdio.h>
 
 
 /*--------------------------------------------------------------------------*/
@@ -330,7 +337,14 @@ msp430_setup(void)
 #define asmv(arg) __asm__ __volatile__(arg)
 
 #define STACK_EXTRA 32
-static char *cur_break = (char *)(&__bss_end + 1);
+
+static char *cur_break = (char *)(
+#if defined(__MSP430_LIBC__) && 20110612 <= __MSP430_LIBC__
+				  __bss_end
+#else
+				  &__bss_end + 1
+#endif
+);
 
 /*
  * Allocate memory from the heap. Check that we don't collide with the

tests/timertest.c

@@ -38,10 +38,15 @@
  */
 
 #include "msp430setup.h"
+#if __MSPGCC__
+#include <msp430.h>
+#include <legacymsp430.h>
+#else /* __MSPGCC__ */
 #include <signal.h>
-#include <stdio.h>
-#include <string.h>
 #include <io.h>
+#endif /* __MSPGCC__ */
+#include <string.h>
+#include <stdio.h>
 
 /* From Adams test-suite */
 #define TEST(...) if(__VA_ARGS__) {					 \