update patchsets for devkitPPC r18 alpha

dkppc/patches/gcc-4.4.1.patch

@@ -1,17 +1,3 @@
-diff -Nbaur gcc-4.4.0/config.sub gcc-4.4.0-ppc/config.sub
---- gcc-4.4.0/config.sub	2008-12-18 03:27:27.000000000 +0000
-+++ gcc-4.4.0-ppc/config.sub	2009-04-26 22:32:15.000000000 +0100
-@@ -230,6 +230,10 @@
- 		basic_machine=m68k-atari
- 		os=-mint
- 		;;
-+	-gekko)
-+		basic_machine=powerpc-devkitpro
-+		os=-eabi
-+		;;
- esac
- 
- # Decode aliases for certain CPU-COMPANY combinations.
 diff -Nbaur gcc-4.4.0/gcc/config/rs6000/rs6000.h gcc-4.4.0-ppc/gcc/config/rs6000/rs6000.h
 --- gcc-4.4.0/gcc/config/rs6000/rs6000.h	2009-04-10 00:23:07.000000000 +0100
 +++ gcc-4.4.0-ppc/gcc/config/rs6000/rs6000.h	2009-04-27 01:51:15.000000000 +0100
@@ -220,7 +206,16 @@ diff -Nbaur gcc-4.4.0/gcc/config/rs6000/sysv4.opt gcc-4.4.0-ppc/gcc/config/rs600
  Link with libyk.a, libc.a and crt0.o
 diff -Nbaur gcc-4.4.0/gcc/gcc.c gcc-4.4.0-ppc/gcc/gcc.c
 --- gcc-4.4.0/gcc/gcc.c	2009-03-17 21:25:59.000000000 +0000
-+++ gcc-4.4.0-ppc/gcc/gcc.c	2009-04-26 22:58:37.000000000 +0100
++++ gcc-4.4.0-ppc/gcc/gcc.c	2009-06-17 02:15:34.000000000 +0100
+@@ -698,7 +698,7 @@
+    -lgcc and -lc order specially, yet not require them to override all
+    of LINK_COMMAND_SPEC.  */
+ #ifndef LINK_GCC_C_SEQUENCE_SPEC
+-#define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
++#define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G -lm"
+ #endif
+ 
+ #ifndef LINK_SSP_SPEC
 @@ -3455,8 +3455,6 @@
        gcc_libexec_prefix = make_relative_prefix (argv[0],
  						 standard_bindir_prefix,

dkppc/rules/base_rules

@@ -1,12 +1,13 @@
 #---------------------------------------------------------------------------------
-# path to tools - this can be deleted if you set the path in windows
+# path to tools 
 #---------------------------------------------------------------------------------
-export PATH		:=	$(DEVKITPPC)/bin:$(PATH)
+export PATH		:=	$(DEVKITPPC)/bin:$(DEVKITPRO)/portlibs/ppc/bin:$(PATH)
+export PORTLIBS	:=	$(DEVKITPRO)/portlibs/ppc
 
 #---------------------------------------------------------------------------------
 # the prefix on the compiler executables
 #---------------------------------------------------------------------------------
-PREFIX	:=	powerpc-gekko-
+PREFIX	:=	powerpc-eabi-
 
 export AS		:=	$(PREFIX)as
 export CC		:=	$(PREFIX)gcc

dkppc/scripts/build-crtls.sh

@@ -29,6 +29,8 @@ then
   touch installed-libogc
 fi
 
+cd $BUILDSCRIPTDIR
+
 cd $LIBFAT_SRCDIR
 if [ ! -f built-libfat ]
 then

dkppc/scripts/build-gcc.sh

@@ -90,32 +90,33 @@ cd $target/gcc
 
 if [ ! -f configured-gcc ]
 then
-   CFLAGS="$cflags" LDFLAGS="$ldflags" CFLAGS_FOR_TARGET="-O2" LDFLAGS_FOR_TARGET="" ../../$GCC_SRCDIR/configure \
+  cp -r $BUILDSCRIPTDIR/$NEWLIB_SRCDIR/newlib/libc/include $INSTALLDIR/devkitPPC/$target/sys-include
+  CFLAGS="$cflags" LDFLAGS="$ldflags" CFLAGS_FOR_TARGET="-O2" LDFLAGS_FOR_TARGET="" ../../$GCC_SRCDIR/configure \
   --enable-languages=c,c++,objc \
-  --with-cpu=750\
-  --without-headers\
+  --with-cpu=750 \
   --disable-nls --disable-shared --enable-threads --disable-multilib \
-  --disable-win32-registry\
+  --disable-win32-registry \
   --disable-libstdcxx-pch \
   --target=$target \
   --with-newlib \
   --prefix=$prefix\
   --disable-dependency-tracking \
-  --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitPPC release 18 alpha" \
+  --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitPPC release 18 alpha5" \
   2>&1 | tee gcc_configure.log
   touch configured-gcc
 fi
 
-if [ ! -f built-gcc ]
+if [ ! -f built-gcc-stage1 ]
 then
-  $MAKE all-gcc || { echo "Error building gcc"; exit 1; }
-  touch built-gcc
+  $MAKE all-gcc || { echo "Error building gcc stage1"; exit 1; }
+  touch built-gcc-stage1
 fi
 
-if [ ! -f installed-gcc ]
+if [ ! -f installed-gcc-stage1 ]
 then
-  $MAKE install-gcc || { echo "Error installing gcc"; exit 1; }
-  touch installed-gcc
+  $MAKE install-gcc || { echo "Error installing gcc stage1"; exit 1; }
+  touch installed-gcc-stage1
+  rm -fr $INSTALLDIR/devkitPPC/$target/sys-include
 fi
 
 #---------------------------------------------------------------------------------
@@ -157,20 +158,22 @@ cd $BUILDSCRIPTDIR
 #---------------------------------------------------------------------------------
 
 cd $BUILDSCRIPTDIR
+mkdir -p $target/gcc
 cd $target/gcc
 
-if [ ! -f built-gpp ]
+if [ ! -f built-gcc-stage2 ]
 then
-  $MAKE || { echo "Error building g++"; exit 1; }
-  touch built-gpp
+  $MAKE all || { echo "Error building gcc stage2"; exit 1; }
+  touch built-gcc-stage2
 fi
 
-if [ ! -f installed-gpp ]
+if [ ! -f installed-gcc-stage2 ]
 then
-  $MAKE install || { echo "Error installing g++"; exit 1; }
-  touch installed-gpp
+  $MAKE install || { echo "Error installing gcc stage2"; exit 1; }
+  touch installed-gcc
 fi
 
+
 cd $BUILDSCRIPTDIR
 
 #---------------------------------------------------------------------------------