Mass platform updates for GCC 4.6.3

* -mmcu option now uses different strings to reference specific msp430
  parts.  For example, where the string msp430x1611 was valid before,
  the new equivalent string is msp430f1611.
* The option -mdisable-hwmul has been changed to -mmpy=none

diff --git a/support/make/epic.target b/support/make/epic.target
index 72891fe728038538045b33489a8322e90416b0bc..9c53617fd61ce43b378f96e9734f601309ce47b0 100644 (file)
--- a/support/make/epic.target
+++ b/support/make/epic.target
@@ -4,7 +4,7 @@
 PLATFORM ?= epic
 
 # Remove MSP430 hardware multiply disable: new msp430-gcc fixes
-# PFLAGS += -mdisable-hwmul
+# PFLAGS += -mmpy=none
 # OPTFLAGS += -O
 
 # Default BSL assumes telosb-like programming interface

diff --git a/support/make/eyesIFXv1.target b/support/make/eyesIFXv1.target
index adbc481219a4c1b1e3bad0631f60bfe9a53f9af1..203421342249da4bea89793f9694f6f64624bb62 100644 (file)
--- a/support/make/eyesIFXv1.target
+++ b/support/make/eyesIFXv1.target
@@ -6,7 +6,7 @@ PLATFORM = eyesIFXv1
 MSP_MCU = msp430f149
 
 # Remove MSP430 hardware multiply disable: new msp430-gcc fixes
-# PFLAGS += -mdisable-hwmul
+# PFLAGS += -mmpy=none
 OPTFLAGS += -O
 
 ifndef DEFAULT_PROGRAM

diff --git a/support/make/eyesIFXv2.target b/support/make/eyesIFXv2.target
index 9ddf0974d62454b1ae22e6384b2cce06b98ca0a9..52eb7812e5eed63f04ef469ce9f706956d63f36c 100644 (file)
--- a/support/make/eyesIFXv2.target
+++ b/support/make/eyesIFXv2.target
@@ -10,7 +10,7 @@ VOLUME_FILE = volumes-at45db.xml
 VOLUME_ALLOCATOR ?= tos-storage-at45db
 
 # Disable MSP430 hardware multiply because it makes MSPGCC die
-PFLAGS += -mdisable-hwmul
+PFLAGS += -mmpy=none
 OPTFLAGS += -O
 
 ifndef DEFAULT_PROGRAM
@@ -25,7 +25,7 @@ ifeq (,$(findstring /dev/ttyUSB,$(BSL)))
   endif
 endif
 
-NESC_FLAGS:=-Wnesc-all -mdisable-hwmul
+NESC_FLAGS:=-Wnesc-all -mmpy=none
 
 $(call TOSMake_include_platform,msp)
 

diff --git a/support/make/olimexp169.target b/support/make/olimexp169.target
index 7446fae5b564eae67d8a2b01530ade7f22ffc69e..3a5e7bd9a0638306321972866dbc7e22c5c08bb8 100644 (file)
--- a/support/make/olimexp169.target
+++ b/support/make/olimexp169.target
@@ -6,7 +6,7 @@ PLATFORM ?= olimexp169
 #MSP_MCU = msp430f169
 
 # Disable MSP430 hardware multiply because it makes MSPGCC die
-PFLAGS += -mdisable-hwmul
+PFLAGS += -mmpy=none
 OPTFLAGS += -O
 
 # Olimex P169 doesn't support bsl

diff --git a/support/make/shimmer.target b/support/make/shimmer.target
index db5911f1c57086d5744279fb3056c187b7065c06..d1fc406f25634a3bcc53883254739511c439f43d 100644 (file)
--- a/support/make/shimmer.target
+++ b/support/make/shimmer.target
@@ -1,7 +1,7 @@
 PLATFORM = shimmer
 
 # Remove MSP430 hardware multiply disable: new msp430-gcc fixes
-# PFLAGS += -mdisable-hwmul 
+# PFLAGS += -mmpy=none
 
 OPTFLAGS += -O
 

diff --git a/support/make/shimmer2.target b/support/make/shimmer2.target
index 7f3ac4d4bd164142a667cd11c970b2dfafbf36f1..57f0ea9e9eef881566cedb712fae3cb4eee06360 100644 (file)
--- a/support/make/shimmer2.target
+++ b/support/make/shimmer2.target
@@ -1,7 +1,7 @@
 PLATFORM = shimmer2
 
 # Remove MSP430 hardware multiply disable: new msp430-gcc fixes
-# PFLAGS += -mdisable-hwmul 
+# PFLAGS += -mmpy=none
 
 OPTFLAGS += -O
 

diff --git a/support/make/telosa.target b/support/make/telosa.target
index 7fd6ac5f4f5a0eb91e3e8a2a975ba3e011611578..8f82db944933f1862a6a02938c8b6397941d4bcf 100644 (file)
--- a/support/make/telosa.target
+++ b/support/make/telosa.target
@@ -6,7 +6,7 @@ PLATFORM ?= telosa
 MSP_MCU = msp430f149
 
 # Remove MSP430 hardware multiply disable: new msp430-gcc fixes
-# PFLAGS += -mdisable-hwmul
+# PFLAGS += -mmpy=none
 
 OPTFLAGS += -O
 

diff --git a/support/make/telosb.target b/support/make/telosb.target
index 55015a4b386434f8d9255a9589d6720d9bcd8864..377145a314070b5bf95c499fe26a317a6d67926b 100644 (file)
--- a/support/make/telosb.target
+++ b/support/make/telosb.target
@@ -6,7 +6,7 @@ PLATFORM ?= telosb
 #MSP_MCU = msp430f1611
 
 # Remove MSP430 hardware multiply disable: new msp430-gcc fixes
-# PFLAGS += -mdisable-hwmul
+# PFLAGS += -mmpy=none
 
 OPTFLAGS += -O
 

diff --git a/support/make/tinynode.target b/support/make/tinynode.target
index 6c669064db8ca3125029d0710afff8db8aa2d9ca..9ea8453eb41672eb36300fe5ec24425ed73a4036 100644 (file)
--- a/support/make/tinynode.target
+++ b/support/make/tinynode.target
@@ -17,7 +17,7 @@ OPTFLAGS += -Os
 #OPTFLAGS = 
 
 # Disable MSP430 hardware multiply because it makes MSPGCC die
-PFLAGS += -mdisable-hwmul
+PFLAGS += -mmpy=none
 PFLAGS += -mstrict-align
 
 $(call TOSMake_include_platform,tinynode)

diff --git a/support/make/tmicore.target b/support/make/tmicore.target
index 9cc9fdb9bd7426036da50137d3af52987a9ac378..2179b12575160773f862f4d6536f8ef1262ca084 100644 (file)
--- a/support/make/tmicore.target
+++ b/support/make/tmicore.target
@@ -6,7 +6,7 @@ PLATFORM ?= tmicore
 #MSP_MCU = msp430f2417
 
 # Remove MSP430 hardware multiply disable: new msp430-gcc fixes
-# PFLAGS += -mdisable-hwmul
+# PFLAGS += -mmpy=none
 OPTFLAGS += -O
 
 MSP_BSL ?= tos-bsl

diff --git a/support/make/tmirws.target b/support/make/tmirws.target
index 2420317691161c07e5721d82aa69314538ab55f8..9973b2ee462f712e89f21e31ba23323c589ef307 100644 (file)
--- a/support/make/tmirws.target
+++ b/support/make/tmirws.target
@@ -6,7 +6,7 @@ PLATFORM ?= tmirws
 #MSP_MCU = msp430f2417
 
 # Disable MSP430 hardware multiply because it makes MSPGCC die
-# PFLAGS += -mdisable-hwmul
+# PFLAGS += -mmpy=none
 OPTFLAGS += -O
 
 MSP_BSL ?= tos-bsl

diff --git a/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app b/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app
index 480b24cde3b659efad400ae828d2f38ebaa0ac4a..e70052061aad65c8fe355e3160563153a73c5b2a 100755 (executable)
--- a/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app
+++ b/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app
@@ -37,7 +37,7 @@ FLAG=$2
 GCC="msp430-gcc"
 OBJCOPY="msp430-objcopy"
 NESCFLAGS="-target=telosb -x nesc -fnesc-target=msp430"
-CFLAGS="-c -gcc=$GCC -mmcu=msp430f1611 -Os -mdisable-hwmul -Wall -Wshadow"
+CFLAGS="-c -gcc=$GCC -mmcu=msp430f1611 -Os -mmpy=none -Wall -Wshadow"
 
 OBJFILE=`basename $CFILE .c`.o
 BINFILE=`basename $CFILE .c`.bin

diff --git a/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app.1 b/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app.1
index a08d0da3d0c02064d50b5f4c2b14c727677cf66f..f8d57f222eb2643f56bcbc2d70334f59b8c3eb3e 100755 (executable)
--- a/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app.1
+++ b/tools/tinyos/tosthreads/tosthreads-gen-dynamic-app.1
@@ -15,7 +15,7 @@ FLAG=$2
 GCC="msp430-gcc"
 OBJCOPY="msp430-objcopy"
 NESCFLAGS="-target=telosb -x nesc -fnesc-target=msp430"
-CFLAGS="-c -gcc=$GCC -mmcu=msp430f1611 -Os -mdisable-hwmul -Wall -Wshadow"
+CFLAGS="-c -gcc=$GCC -mmcu=msp430f1611 -Os -mmpy=none -Wall -Wshadow"
 
 OBJFILE=`basename $CFILE .c`.o
 BINFILE=`basename $CFILE .c`.bin