CVS: gcc/gcc-3.3/gcc/config/msp430 msp430.c, 1.90, 1.91 msp430.h, 1.36, 1.37

Update of /cvsroot/mspgcc/gcc/gcc-3.3/gcc/config/msp430
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv19425/gcc/gcc-3.3/gcc/config/msp430

Modified Files:
	msp430.c msp430.h 
Log Message:
The MSP430X devices now cause __MSP430X__ to be defined, so actions like
altering the vector table can occur in the header files.
A few errors in the arch definitions for some of the 2xx devices, and the
name of the startup object file for the G4616 have been fixed


Index: msp430.c
===================================================================
RCS file: /cvsroot/mspgcc/gcc/gcc-3.3/gcc/config/msp430/msp430.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -w -d -r1.90 -r1.91
--- msp430.c	23 Apr 2006 16:18:20 -0000	1.90
+++ msp430.c	15 Nov 2006 15:46:27 -0000	1.91
@@ -116,9 +116,9 @@
   MSP430_ISA_14 = 14,
   MSP430_ISA_15 = 15,
   MSP430_ISA_16 = 16,
-  MSP430_ISA_200 = 200,
-  MSP430_ISA_210 = 210,
-  MSP430_ISA_220 = 220,
+  MSP430_ISA_20 = 20,
+  MSP430_ISA_21 = 21,
+  MSP430_ISA_22 = 22,
   MSP430_ISA_31 = 31,
   MSP430_ISA_32 = 32,
   MSP430_ISA_33 = 33,
@@ -177,23 +177,23 @@
   {"msp430x1611",  MSP430_ISA_16, 1},
   {"msp430x1612",  MSP430_ISA_16, 1},
 
-  {"msp430x2001",  MSP430_ISA_200, 0},
-  {"msp430x2011",  MSP430_ISA_200, 0},
+  {"msp430x2001",  MSP430_ISA_20, 0},
+  {"msp430x2011",  MSP430_ISA_20, 0},
 
-  {"msp430x2002",  MSP430_ISA_200, 0},
-  {"msp430x2012",  MSP430_ISA_200, 0},
+  {"msp430x2002",  MSP430_ISA_20, 0},
+  {"msp430x2012",  MSP430_ISA_20, 0},
 
-  {"msp430x2003",  MSP430_ISA_200, 0},
-  {"msp430x2013",  MSP430_ISA_200, 0},
+  {"msp430x2003",  MSP430_ISA_20, 0},
+  {"msp430x2013",  MSP430_ISA_20, 0},
 
-  {"msp430x2101",  MSP430_ISA_210, 0},
-  {"msp430x2111",  MSP430_ISA_210, 0},
-  {"msp430x2121",  MSP430_ISA_210, 0},
-  {"msp430x2131",  MSP430_ISA_210, 0},
+  {"msp430x2101",  MSP430_ISA_21, 0},
+  {"msp430x2111",  MSP430_ISA_21, 0},
+  {"msp430x2121",  MSP430_ISA_21, 0},
+  {"msp430x2131",  MSP430_ISA_21, 0},
 
-  {"msp430x2234",  MSP430_ISA_220, 0},
-  {"msp430x2254",  MSP430_ISA_220, 0},
-  {"msp430x2274",  MSP430_ISA_220, 0},
+  {"msp430x2234",  MSP430_ISA_22, 0},
+  {"msp430x2254",  MSP430_ISA_22, 0},
+  {"msp430x2274",  MSP430_ISA_22, 0},
 
   {"msp430x311",   MSP430_ISA_31, 0},
   {"msp430x312",   MSP430_ISA_31, 0},

Index: msp430.h
===================================================================
RCS file: /cvsroot/mspgcc/gcc/gcc-3.3/gcc/config/msp430/msp430.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -d -r1.36 -r1.37
--- msp430.h	23 Apr 2006 16:23:04 -0000	1.36
+++ msp430.h	15 Nov 2006 15:46:27 -0000	1.37
@@ -2878,10 +2878,10 @@
 %{mmcu=msp430x447:%(cpp_msp2) -D__MSP430_447__ -DMSP430_HAS_HWMUL} \
 %{mmcu=msp430x448:%(cpp_msp2) -D__MSP430_448__ -DMSP430_HAS_HWMUL} \
 %{mmcu=msp430x449:%(cpp_msp2) -D__MSP430_449__ -DMSP430_HAS_HWMUL} \
-%{mmcu=msp430xG4616:%(cpp_msp2) -D__MSP430_G4616__ -DMSP430_HAS_HWMUL} \
-%{mmcu=msp430xG4617:%(cpp_msp2) -D__MSP430_G4617__ -DMSP430_HAS_HWMUL} \
-%{mmcu=msp430xG4618:%(cpp_msp2) -D__MSP430_G4618__ -DMSP430_HAS_HWMUL} \
-%{mmcu=msp430xG4619:%(cpp_msp2) -D__MSP430_G4619__ -DMSP430_HAS_HWMUL} \
+%{mmcu=msp430xG4616:%(cpp_msp2) -D__MSP430_G4616__ -D__MSP430X__ -DMSP430_HAS_HWMUL} \
+%{mmcu=msp430xG4617:%(cpp_msp2) -D__MSP430_G4617__ -D__MSP430X__ -DMSP430_HAS_HWMUL} \
+%{mmcu=msp430xG4618:%(cpp_msp2) -D__MSP430_G4618__ -D__MSP430X__ -DMSP430_HAS_HWMUL} \
+%{mmcu=msp430xG4619:%(cpp_msp2) -D__MSP430_G4619__ -D__MSP430X__ -DMSP430_HAS_HWMUL} \
 %{mint8:-D__SIZE_TYPE__=long\\ unsigned\\ int -D__PTRDIFF_TYPE__=long -D__INT_MAX__=127} \
 %{!mint*:-D__SIZE_TYPE__=unsigned\\ int -D__PTRDIFF_TYPE__=int -D__INT_MAX__=32767} \
 %{posix:-D_POSIX_SOURCE} %{mIAR:-D_IAR_ASSEMBLER_}"
@@ -3150,7 +3150,7 @@
 %{mmcu=msp430x447:crt430x447.o%s} \
 %{mmcu=msp430x448:crt430x448.o%s} \
 %{mmcu=msp430x449:crt430x449.o%s} \
-%{mmcu=msp430xG4616:crt430xg4616.o%s} \
+%{mmcu=msp430xG4616:crt430xG4616.o%s} \
 %{mmcu=msp430xG4617:crt430xG4617.o%s} \
 %{mmcu=msp430xG4618:crt430xG4618.o%s} \
 %{mmcu=msp430xG4619:crt430xG4619.o%s}"


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV