[Tinyos-commits] CVS: tinyos-1.x/tools/src/mspgcc build-mspgcc, 1.8, 1.9

[Cory Sharp]

Update of /cvsroot/tinyos/tinyos-1.x/tools/src/mspgcc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1562

Modified Files:
	build-mspgcc 
Log Message:
* Patch MSPGCC's gcc/config/msp430/msp430.c to not segfault under certain
conditions.  I'm not sure how in-/appropriate this fix is, but I've been using
it for a while, and it works.  Comments are welcome.

* Bump binutils from 2.16.1 to 2.17

* Bump the MSPGCC CVS from 1 Jun 2005 to 1 Aug 2006

Index: build-mspgcc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/src/mspgcc/build-mspgcc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build-mspgcc	9 Jun 2006 00:36:43 -0000	1.8
--- build-mspgcc	23 Aug 2006 20:48:17 -0000	1.9
***************
*** 59,67 ****
  # which take on defaults defined below if unspecified.
  
! BINUTILS_URL="ftp://ftp.gnu.org/gnu/binutils/binutils-2.16.1.tar.bz2"
  GCC32_URL="ftp://ftp.gnu.org/gnu/gcc/gcc-3.2.3/gcc-core-3.2.3.tar.bz2"
  GCC33_URL="ftp://ftp.gnu.org/gnu/gcc/gcc-3.3.5/gcc-core-3.3.5.tar.bz2"
  MSPGCC_CVS_ARCHIVE=mspgcc-cvs.tar.gz
! MSPGCC_CVS_DATE="1 Jun 2005"   # "now" is an option, see 1 Jun 2005 discussion thread "[tinyos-msp430] msp430 compiler tools"
  LIBC_ARCHIVE="$MSPGCC_CVS_ARCHIVE"
  LIBC_DIR="mspgcc-cvs/msp430-libc/src"
--- 59,67 ----
  # which take on defaults defined below if unspecified.
  
! BINUTILS_URL="ftp://ftp.gnu.org/gnu/binutils/binutils-2.17.tar.bz2"
  GCC32_URL="ftp://ftp.gnu.org/gnu/gcc/gcc-3.2.3/gcc-core-3.2.3.tar.bz2"
  GCC33_URL="ftp://ftp.gnu.org/gnu/gcc/gcc-3.3.5/gcc-core-3.3.5.tar.bz2"
  MSPGCC_CVS_ARCHIVE=mspgcc-cvs.tar.gz
! MSPGCC_CVS_DATE="1 Aug 2006"   # "now" is an option, see 1 Jun 2005 discussion thread "[tinyos-msp430] msp430 compiler tools"
  LIBC_ARCHIVE="$MSPGCC_CVS_ARCHIVE"
  LIBC_DIR="mspgcc-cvs/msp430-libc/src"
***************
*** 127,130 ****
--- 127,144 ----
    fi
    cvs -z3 -d$SF_CVS_SERVER:/cvsroot/mspgcc export -D "$MSPGCC_CVS_DATE" gcc msp430-libc
+   patch -p1 <<EOF
+ diff -N -r -u mspgcc-cvs/gcc/gcc-3.3/gcc/config/msp430/msp430.c mspgcc-cvs-moteiv/gcc/gcc-3.3/gcc/config/msp430/msp430.c
+ --- mspgcc-cvs/gcc/gcc-3.3/gcc/config/msp430/msp430.c   2006-04-23 09:18:20.000000000 -0700
+ +++ mspgcc-cvs-moteiv/gcc/gcc-3.3/gcc/config/msp430/msp430.c    2006-08-02 13:47:05.953125000 -0700
+ @@ -6157,7 +6157,7 @@
+        rtx pat = PATTERN (next);
+        rtx src, t;
+ 
+ -      if (GET_CODE (pat) == RETURN)
+ +      if ((GET_CODE (pat) == RETURN) || (GET_CODE (pat) == PARALLEL))
+  	return UNKNOWN;
+ 
+        src = SET_SRC (pat);
+ EOF
    cd $START_DIR
    cd $ARCHIVE_DIR