Merge pull request #306 from adamdunkels/push/travis-mspgcc-4-7-0

Update travis to use mspgcc 4.7.0

.travis.yml

@@ -4,7 +4,10 @@ language: c #NOTE: this will set CC=gcc which might cause trouble
 before_script:
   - "sudo apt-get -qq update"
   ## Install these mainline toolchains for all build types
-  - "sudo apt-get -qq install gcc-msp430 || true"
+  - "sudo apt-get -qq install lib32z1 || true"
+  - "curl -s \
+       http://adamdunkels.github.io/contiki-fork/mspgcc-4.7.0-compiled.tar.bz2 \
+         | tar xjf - -C /tmp/ && sudo cp -f -r /tmp/msp430/* /usr/local/ && rm -rf /tmp/msp430 && msp430-gcc --version || true"
   - "sudo apt-get -qq install gcc-avr avr-libc || true"
   - "sudo apt-get -qq install srecord || true"
   - "sudo apt-get -qq install libc6:i386 libgcc1:i386 gcc-4.6-base:i386 libstdc++5:i386 libstdc++6:i386 || true"

core/loader/elfloader.c

@@ -192,6 +192,8 @@ find_local_symbol(int fd, const char *symbol,
 	  sect = &bss;
 	} else if(s.st_shndx == data.number) {
 	  sect = &data;
+  } else if(s.st_shndx == rodata.number) {
+    sect = &rodata;
 	} else if(s.st_shndx == text.number) {
 	  sect = &text;
 	} else {

platform/exp5438/Makefile.exp5438

@@ -44,6 +44,15 @@ ifeq ($(UIP_CONF_IPV6),1)
 CFLAGS += -DWITH_UIP6=1
 endif
 
+ifndef IAR
+ifneq (,$(findstring 4.7.,$(shell msp430-gcc -dumpversion)))
+TARGET_MEMORY_MODEL ?= medium
+CFLAGS += -mmemory-model=$(TARGET_MEMORY_MODEL)
+CFLAGS += -ffunction-sections -fdata-sections -mcode-region=far
+LDFLAGS += -mmemory-model=$(TARGET_MEMORY_MODEL) -Wl,-gc-sections
+endif
+endif
+
 CONTIKI_TARGET_SOURCEFILES += $(ARCH) $(UIPDRIVERS)
 
 ifdef IAR

platform/exp5438/lcd.c

@@ -34,7 +34,7 @@
 #include "lcd.h"
 #include "hal_lcd.h"
 
-#define WITH_LCD 1
+#define WITH_LCD 0
 
 #define Y_MAX 9
 #define X_MAX 15

platform/exp5438/platform-conf.h

@@ -40,9 +40,12 @@
 
 /*
  * Definitions below are dictated by the hardware and not really
- * changeable!
+ * changeable
  */
-#define TYNDALL 1
+
+#ifndef WITH_LCD
+#define WITH_LCD 0
+#endif /* 0 */
 
 /* CPU target speed in Hz */
 #define F_CPU 8000000uL // 8MHz by default

tools/cooja/java/se/sics/cooja/GUI.java

@@ -2673,6 +2673,10 @@ public class GUI extends Observable {
    * @param askForConfirmation Should we ask for confirmation before quitting?
    */
   public void doQuit(boolean askForConfirmation) {
+    doQuit(askForConfirmation, 0);
+  }
+  
+  public void doQuit(boolean askForConfirmation, int exitCode) {
     if (isVisualizedInApplet()) {
       return;
     }
@@ -2726,7 +2730,7 @@ public class GUI extends Observable {
     }
     saveExternalToolsUserSettings();
 
-    System.exit(0);
+    System.exit(exitCode);
   }
 
   // // EXTERNAL TOOLS SETTINGS METHODS ////

tools/cooja/java/se/sics/cooja/plugins/LogScriptEngine.java

@@ -101,6 +101,8 @@ public class LogScriptEngine {
   private long startRealTime;
   private long nextProgress;
 
+  private int exitCode = 0;
+  
   public LogScriptEngine(Simulation simulation) {
     this.simulation = simulation;
   }
@@ -369,6 +371,7 @@ public class LogScriptEngine {
       if (!scriptActive) {
         return;
       }
+      exitCode = 2;
       logger.info("Timeout event @ " + t);
       engine.put("TIMEOUT", true);
       stepScript();
@@ -398,14 +401,14 @@ public class LogScriptEngine {
       new Thread() {
         public void run() {
           try { Thread.sleep(500); } catch (InterruptedException e) { }
-          simulation.getGUI().doQuit(false);
+          simulation.getGUI().doQuit(false, exitCode);
         };
       }.start();
       new Thread() {
         public void run() {
           try { Thread.sleep(2000); } catch (InterruptedException e) { }
           logger.warn("Killing Cooja");
-          System.exit(1);
+          System.exit(exitCode);
         };
       }.start();
     }
@@ -439,10 +442,12 @@ public class LogScriptEngine {
     }
 
     public void testOK() {
+      exitCode = 0;
       log("TEST OK\n");
       deactive();
     }
     public void testFailed() {
+      exitCode = 1;
       log("TEST FAILED\n");
       deactive();
     }

tools/mknmlist

@@ -23,7 +23,7 @@ BEGIN {
  builtin[""] = 	"";
 }
 
-/^[0123456789abcdef]+ [ABCDGRSTUVW] / {
+/^[0123456789abcdef]+ [ABCDGRSTUVW] [^__]/ {
   if ($3 != "symbols" && $3 != "symbols_nelts") {
     name[nname] = $3;
     nname++;