From 9abe7dbbdc874dd65e8f65f86b6ebb19969b40ba Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Tue, 19 Aug 2014 09:37:49 -0600 Subject: [PATCH] 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 --- support/make/epic.target | 2 +- support/make/eyesIFXv1.target | 2 +- support/make/eyesIFXv2.target | 4 ++-- support/make/olimexp169.target | 2 +- support/make/shimmer.target | 2 +- support/make/shimmer2.target | 2 +- support/make/telosa.target | 2 +- support/make/telosb.target | 2 +- support/make/tinynode.target | 2 +- support/make/tmicore.target | 2 +- support/make/tmirws.target | 2 +- tools/tinyos/tosthreads/tosthreads-gen-dynamic-app | 2 +- tools/tinyos/tosthreads/tosthreads-gen-dynamic-app.1 | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/support/make/epic.target b/support/make/epic.target index 72891fe7..9c53617f 100644 --- 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 adbc4812..20342134 100644 --- 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 9ddf0974..52eb7812 100644 --- 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 7446fae5..3a5e7bd9 100644 --- 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 db5911f1..d1fc406f 100644 --- 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 7f3ac4d4..57f0ea9e 100644 --- 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 7fd6ac5f..8f82db94 100644 --- 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 55015a4b..377145a3 100644 --- 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 6c669064..9ea8453e 100644 --- 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 9cc9fdb9..2179b125 100644 --- 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 24203176..9973b2ee 100644 --- 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 480b24cd..e7005206 100755 --- 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 a08d0da3..f8d57f22 100755 --- 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 -- 2.39.2