CXXFLAGS needs OSX extras

Signed-off-by: Dave Murphy <wntrmute@users.sourceforge.net>

.gitignore

@@ -2,3 +2,6 @@ config.sh
 .devkitARM*
 .devkitPPC*
 .devkitPSP*
+*.gz
+*.bz2
+*~

README.TXT

@@ -13,8 +13,6 @@ Bison, Flex and Wget from the gnuwin32 project
 
 http://sourceforge.net/projects/gnuwin32/
 
-For devkitPSP a command line subversion client is required to get the PSP SDK http://www.tigris.org
-
 required packages for building on debian/*buntu
 
 sudo apt-get install build-essential autoconf automake bison flex libncurses5-dev libreadline-dev texinfo
@@ -25,10 +23,12 @@ http://gmplib.org/
 http://www.mpfr.org/
 http://www.multiprecision.org/
 
-Some of the tools for devkitARM and devkitPPC also require FreeImage and zlib
+Some of the tools for devkitARM and devkitPPC also require FreeImage, zlib, and libusb
 
 http://freeimage.sourceforge.net/
 http://www.zlib.net
+http://www.libusb.org
+
  
 Downloading the source packages
 -------------------------------

build-devkit.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 #---------------------------------------------------------------------------------
 # Build scripts for
-#	devkitARM release 38
-#	devkitPPC release 26
+#	devkitARM release 42
+#	devkitPPC release 27
 #	devkitPSP release 17
 #---------------------------------------------------------------------------------
 
@@ -11,8 +11,8 @@ if [ 1 -eq 1 ] ; then
 	echo "Please use the latest release buildscripts unless advised otherwise by devkitPro staff."
 	echo "http://sourceforge.net/projects/devkitpro/files/buildscripts/"
 	echo
-	echo "The scripts in svn are quite often dependent on things which currently only exist on developer"
-	echo "machines. This is not a bug, use stable releases."
+	echo "The scripts in the git repository are quite often dependent on things which currently only exist"
+	echo "on developer machines. This is not a bug, use stable releases."
 	exit 1
 fi
 
@@ -24,18 +24,19 @@ echo "Patches and improvements are of course welcome, please send these to the p
 echo "https://sourceforge.net/tracker/?group_id=114505&atid=668553"
 echo
 
-LIBOGC_VER=1.8.10
+LIBOGC_VER=1.8.12
 LIBGBA_VER=20090222
-LIBNDS_VER=1.5.5
+LIBNDS_VER=1.5.8
 DEFAULT_ARM7_VER=0.5.24
-DSWIFI_VER=0.3.13
+DSWIFI_VER=0.3.16
 LIBMIRKO_VER=0.9.7
-MAXMOD_VER=1.0.7
-FILESYSTEM_VER=0.9.9
-LIBFAT_VER=1.0.11
+MAXMOD_VER=1.0.9
+FILESYSTEM_VER=0.9.11
+LIBFAT_VER=1.0.12
 PSPSDK_VER=20120404
 GBATOOLS_VER=1.0.0
-GRIT_VER=0.8.10
+DSTOOLS_VER=1.0.0
+GRIT_VER=0.8.12
 NDSTOOL_VER=1.50.1
 GENERAL_TOOLS_VER=1.0.0
 DLDITOOL_VER=1.24.0
@@ -44,6 +45,8 @@ GCDSPSUITE_VER=1.4.0
 ELF2DOL_VER=1.0.0
 WIILOAD_VER=0.5.1
 MMUTIL_VER=1.8.6
+DFU_UTIL_VER=0.7
+STLINK_VER=0.5.7
 
 #---------------------------------------------------------------------------------
 function extract_and_patch {
@@ -60,7 +63,7 @@ function extract_and_patch {
 			echo "invalid archive type"
 			exit 1
 		fi
-		tar $extractflags $SRCDIR/$1-$2$archivetype || { echo "Error extracting "$1; exit 1; }
+		tar $extractflags "$SRCDIR/$1-$2$archivetype" || { echo "Error extracting "$1; exit 1; }
 		touch extracted-$1
 	fi
 	if [[ ! -f patched-$1 && -f $patchdir/$1-$2.patch ]]; then
@@ -109,7 +112,7 @@ else
 	echo "for mingw/msys you must use <drive>:/<install path> or you will have include path problems"
 	echo "this is the top level directory for devkitpro, i.e. e:/devkitPro"
 
-	read INSTALLDIR
+	read -e INSTALLDIR
 	echo
 fi
 
@@ -154,7 +157,7 @@ fi
 if [ "$BUILD_DKPRO_AUTOMATED" != "1" ] ; then
 
 	echo
-	echo 'Ready to install '$package' in '$INSTALLDIR
+	echo 'Ready to install '$package' in '$prefix
 	echo
 	echo 'press return to continue'
 
@@ -191,10 +194,11 @@ archives="binutils-${BINUTILS_VER}.tar.bz2 gcc-${GCC_VER}.tar.bz2 newlib-${NEWLI
 if [ $VERSION -eq 1 ]; then
 	targetarchives="libnds-src-${LIBNDS_VER}.tar.bz2 libgba-src-${LIBGBA_VER}.tar.bz2
 		libmirko-src-${LIBMIRKO_VER}.tar.bz2 dswifi-src-${DSWIFI_VER}.tar.bz2 maxmod-src-${MAXMOD_VER}.tar.bz2
-		default-arm7-src-${DEFAULT_ARM7_VER}.tar.bz2 libfilesystem-src-${FILESYSTEM_VER}.tar.bz2
+		default_arm7-src-${DEFAULT_ARM7_VER}.tar.bz2 libfilesystem-src-${FILESYSTEM_VER}.tar.bz2
 		libfat-src-${LIBFAT_VER}.tar.bz2"
-	hostarchives="gbatools-$GBATOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2
-		general-tools-$GENERAL_TOOLS_VER.tar.bz2 dlditool-$DLDITOOL_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2"
+	hostarchives="gbatools-$GBATOOLS_VER.tar.bz2 dstools-$DSTOOLS_VER.tar.bz2 grit-$GRIT_VER.tar.bz2 ndstool-$NDSTOOL_VER.tar.bz2
+		general-tools-$GENERAL_TOOLS_VER.tar.bz2 dlditool-$DLDITOOL_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2
+		dfu-util-$DFU_UTIL_VER.tar.bz2 stlink-$STLINK_VER.tar.bz2"
 fi
 
 if [ $VERSION -eq 2 ]; then
@@ -213,7 +217,7 @@ else
 	SRCDIR=`pwd`
 fi
 
-cd $SRCDIR
+cd "$SRCDIR"
 for archive in $archives $targetarchives $hostarchives
 do
 	echo $archive
@@ -238,13 +242,13 @@ do
 	echo $destdir
 	if [ ! -d $destdir ]; then
 		mkdir -p $destdir
-		bzip2 -cd $SRCDIR/$archive | tar -xf - -C $destdir || { echo "Error extracting "$archive; exit 1; }
+		bzip2 -cd "$SRCDIR/$archive" | tar -xf - -C $destdir || { echo "Error extracting "$archive; exit 1; }
 	fi
 done
 
 for archive in $hostarchives
 do
-	tar -xjf $SRCDIR/$archive
+	tar -xjf "$SRCDIR/$archive"
 done
 
 #---------------------------------------------------------------------------------
@@ -254,12 +258,15 @@ if [ -f $scriptdir/build-gcc.sh ]; then . $scriptdir/build-gcc.sh || { echo "Err
 if [ -f $scriptdir/build-tools.sh ]; then . $scriptdir/build-tools.sh || { echo "Error building tools"; exit 1; }; cd $BUILDSCRIPTDIR; fi
 if [ -f $scriptdir/build-crtls.sh ]; then . $scriptdir/build-crtls.sh || { echo "Error building crtls"; exit 1; }; cd $BUILDSCRIPTDIR; fi
 
-if [ "$CROSSBUILD" = "i686-w64-mingw32" ]; then
+if [ ! -z $CROSSBUILD ]; then
 	if [ $VERSION -ne 3 ]; then
-		cp -v 	/opt/i686-w64-mingw32/mingw/lib/FreeImage.dll $prefix/bin
+		cp -v 	$CROSSLIBPATH/FreeImage.dll $prefix/bin
 	fi
-	cp -v	/opt/i686-w64-mingw32/mingw/lib/libstdc++-6.dll \
-		/opt/i686-w64-mingw32/mingw/lib/libgcc_s_sjlj-1.dll \
+	if [ $VERSION -eq 1 ]; then
+		cp -v $CROSSBINPATH/libusb-1.0.dll $prefix/bin
+	fi
+	cp -v	$CROSSLIBPATH/libstdc++-6.dll \
+		$CROSSLIBPATH/libgcc_s_sjlj-1.dll \
 		$prefix/bin
 fi
 

cross-build-i686-w64-mingw32.sh

@@ -1,3 +1,7 @@
 #!/bin/bash
 export CROSSBUILD=i686-w64-mingw32
+export CROSSLIBPATH=/opt/i686-w64-mingw32/mingw/lib
+export CROSSBINPATH=/opt/i686-w64-mingw32/mingw/bin
 export PATH=/opt/i686-w64-mingw32/bin:$PATH
+export PKG_CONFIG_PATH=$CROSSLIBPATH/pkgconfig
+

cross-build-x86_64-w64-mingw32.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+export CROSSBUILD=x86_64-w64-mingw32
+export CROSSLIBPATH=/opt/x86_64-mingw-w64/mingw/lib
+export CROSSBINPATH=/opt/x86_64-mingw-w64/mingw/bin
+export PATH=/opt/x86_64-mingw-w64/bin:$PATH
+export PKG_CONFIG_PATH=$CROSSLIBPATH/pkgconfig
+

dkarm-eabi/patches/binutils-2.22.patch

@@ -1,162 +0,0 @@
-diff -Nbaur binutils-2.22/bfd/bfd-in2.h binutils-2.22-arm/bfd/bfd-in2.h
---- binutils-2.22/bfd/bfd-in2.h	2011-09-16 02:15:18.000000000 +0100
-+++ binutils-2.22-arm/bfd/bfd-in2.h	2012-04-01 12:58:20.000000000 +0100
-@@ -38,6 +38,8 @@
- 
- #include "ansidecl.h"
- #include "symcat.h"
-+#include <sys/stat.h>
-+
- #if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
- #ifndef SABER
- /* This hack is to avoid a problem with some strict ANSI C preprocessors.
-@@ -308,8 +310,6 @@
-    && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE		\
-    && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
- 
--/* Forward define.  */
--struct stat;
- 
- typedef enum bfd_print_symbol
- {
-diff -Nbaur binutils-2.22/bfd/bfd-in.h binutils-2.22-arm/bfd/bfd-in.h
---- binutils-2.22/bfd/bfd-in.h	2011-09-16 02:15:18.000000000 +0100
-+++ binutils-2.22-arm/bfd/bfd-in.h	2012-04-01 12:58:20.000000000 +0100
-@@ -31,6 +31,8 @@
- 
- #include "ansidecl.h"
- #include "symcat.h"
-+#include <sys/stat.h>
-+
- #if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
- #ifndef SABER
- /* This hack is to avoid a problem with some strict ANSI C preprocessors.
-@@ -301,8 +303,6 @@
-    && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE		\
-    && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
- 
--/* Forward define.  */
--struct stat;
- 
- typedef enum bfd_print_symbol
- {
-diff -Nbaur binutils-2.22/bfd/config.in binutils-2.22-arm/bfd/config.in
---- binutils-2.22/bfd/config.in	2011-05-12 08:41:40.000000000 +0100
-+++ binutils-2.22-arm/bfd/config.in	2012-04-03 17:35:45.000000000 +0100
-@@ -245,6 +245,9 @@
- /* Define if <sys/procfs.h> has win32_pstatus_t. */
- #undef HAVE_WIN32_PSTATUS_T
- 
-+/* Define to 1 if you have the <windows.h> header file. */
-+#undef HAVE_WINDOWS_H
-+
- /* Define to 1 if you have the <zlib.h> header file. */
- #undef HAVE_ZLIB_H
- 
-diff -Nbaur binutils-2.22/bfd/configure binutils-2.22-arm/bfd/configure
---- binutils-2.22/bfd/configure	2011-11-21 11:55:48.000000000 +0000
-+++ binutils-2.22-arm/bfd/configure	2012-04-03 17:35:45.000000000 +0100
-@@ -13508,6 +13508,22 @@
- 
- fi
- 
-+
-+for ac_header in windows.h dlfcn.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether string.h and strings.h may both be included" >&5
- $as_echo_n "checking whether string.h and strings.h may both be included... " >&6; }
- if test "${gcc_cv_header_string+set}" = set; then :
-diff -Nbaur binutils-2.22/bfd/configure.in binutils-2.22-arm/bfd/configure.in
---- binutils-2.22/bfd/configure.in	2011-11-21 11:55:46.000000000 +0000
-+++ binutils-2.22-arm/bfd/configure.in	2012-04-03 17:35:45.000000000 +0100
-@@ -190,6 +190,9 @@
- GCC_HEADER_STDINT(bfd_stdint.h)
- AC_HEADER_TIME
- AC_HEADER_DIRENT
-+
-+AC_CHECK_HEADERS(windows.h dlfcn.h)
-+
- ACX_HEADER_STRING
- AC_CHECK_FUNCS(fcntl getpagesize setitimer sysconf fdopen getuid getgid fileno)
- AC_CHECK_FUNCS(strtoull)
-diff -Nbaur binutils-2.22/bfd/plugin.c binutils-2.22-arm/bfd/plugin.c
---- binutils-2.22/bfd/plugin.c	2011-07-11 16:03:07.000000000 +0100
-+++ binutils-2.22-arm/bfd/plugin.c	2012-04-03 17:35:45.000000000 +0100
-@@ -25,7 +25,13 @@
- #if BFD_SUPPORTS_PLUGINS
- 
- #include <assert.h>
-+#ifdef HAVE_DLFCN_H
- #include <dlfcn.h>
-+#elif defined (HAVE_WINDOWS_H)
-+#include <windows.h>
-+#else
-+#error Unknown how to handle dynamic-load-libraries.
-+#endif
- #include <stdarg.h>
- #include "plugin-api.h"
- #include "sysdep.h"
-@@ -34,6 +40,37 @@
- #include "libiberty.h"
- #include <dirent.h>
- 
-+#if !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H)
-+
-+#define RTLD_NOW 0      /* Dummy value.  */
-+
-+static void *
-+dlopen (const char *file, int mode ATTRIBUTE_UNUSED)
-+{
-+  return LoadLibrary (file);
-+}
-+
-+static void *
-+dlsym (void *handle, const char *name)
-+{
-+  return GetProcAddress (handle, name);
-+}
-+
-+static int ATTRIBUTE_UNUSED
-+dlclose (void *handle)
-+{
-+  FreeLibrary (handle);
-+  return 0;
-+}
-+
-+static const char *
-+dlerror (void)
-+{
-+  return "Unable to load DLL.";
-+}
-+
-+#endif /* !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H)  */
-+
- #define bfd_plugin_close_and_cleanup                  _bfd_generic_close_and_cleanup
- #define bfd_plugin_bfd_free_cached_info               _bfd_generic_bfd_free_cached_info
- #define bfd_plugin_new_section_hook                   _bfd_generic_new_section_hook
-diff -Nbaur binutils-2.22/include/opcode/arm.h binutils-2.22-arm/include/opcode/arm.h
---- binutils-2.22/include/opcode/arm.h	2011-05-31 15:12:55.000000000 +0100
-+++ binutils-2.22-arm/include/opcode/arm.h	2012-04-01 12:58:20.000000000 +0100
-@@ -109,7 +109,8 @@
- #define ARM_AEXT_V6KT2  (ARM_AEXT_V6T2 | ARM_EXT_V6K)
- #define ARM_AEXT_V6ZT2  (ARM_AEXT_V6T2 | ARM_EXT_SEC)
- #define ARM_AEXT_V6ZKT2 (ARM_AEXT_V6T2 | ARM_EXT_V6K | ARM_EXT_SEC)
--#define ARM_AEXT_V7_ARM	(ARM_AEXT_V6KT2 | ARM_EXT_V7 | ARM_EXT_BARRIER)
-+#define ARM_AEXT_V7_ARM	(ARM_AEXT_V6KT2 | ARM_EXT_V7 | ARM_EXT_BARRIER \
-+    | ARM_EXT_OS )
- #define ARM_AEXT_V7A	(ARM_AEXT_V7_ARM | ARM_EXT_V7A)
- #define ARM_AEXT_V7R	(ARM_AEXT_V7_ARM | ARM_EXT_V7R | ARM_EXT_DIV)
- #define ARM_AEXT_NOTM \

dkarm-eabi/patches/binutils-2.24.patch

@@ -0,0 +1,13 @@
+diff -Nbaur binutils-2.24/include/opcode/arm.h binutils-2.24-arm/include/opcode/arm.h
+--- binutils-2.24/include/opcode/arm.h	2013-11-26 11:37:33.000000000 +0000
++++ binutils-2.24-arm/include/opcode/arm.h	2014-02-16 19:32:33.000000000 +0000
+@@ -114,7 +114,8 @@
+ #define ARM_AEXT_V6KT2  (ARM_AEXT_V6T2 | ARM_EXT_V6K)
+ #define ARM_AEXT_V6ZT2  (ARM_AEXT_V6T2 | ARM_EXT_SEC)
+ #define ARM_AEXT_V6ZKT2 (ARM_AEXT_V6T2 | ARM_EXT_V6K | ARM_EXT_SEC)
+-#define ARM_AEXT_V7_ARM	(ARM_AEXT_V6KT2 | ARM_EXT_V7 | ARM_EXT_BARRIER)
++#define ARM_AEXT_V7_ARM	(ARM_AEXT_V6KT2 | ARM_EXT_V7 | ARM_EXT_BARRIER \
++    | ARM_EXT_OS )
+ #define ARM_AEXT_V7A	(ARM_AEXT_V7_ARM | ARM_EXT_V7A)
+ #define ARM_AEXT_V7VE	(ARM_AEXT_V7A  | ARM_EXT_DIV | ARM_EXT_ADIV \
+     | ARM_EXT_VIRT | ARM_EXT_SEC | ARM_EXT_MP)

dkarm-eabi/patches/gcc-4.8.2.patch

@@ -1,7 +1,7 @@
-diff -Nbaur gcc-4.7.0/gcc/config/arm/t-arm-elf gcc-4.7.0-arm/gcc/config/arm/t-arm-elf
---- gcc-4.7.0/gcc/config/arm/t-arm-elf	2011-11-02 15:23:48.000000000 +0000
-+++ gcc-4.7.0-arm/gcc/config/arm/t-arm-elf	2012-04-05 20:36:17.000000000 +0100
-@@ -26,22 +26,44 @@
+diff -Nbaur gcc-4.8.2/gcc/config/arm/t-arm-elf gcc-4.8.2-arm/gcc/config/arm/t-arm-elf
+--- gcc-4.8.2/gcc/config/arm/t-arm-elf	2013-01-10 20:38:27.000000000 +0000
++++ gcc-4.8.2-arm/gcc/config/arm/t-arm-elf	2014-02-16 19:36:15.000000000 +0000
+@@ -25,22 +25,44 @@
  #MULTILIB_DIRNAMES    += fa526 fa626 fa606te fa626te fmp626 fa726te
  #MULTILIB_EXCEPTIONS  += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626
  
@@ -58,7 +58,7 @@ diff -Nbaur gcc-4.7.0/gcc/config/arm/t-arm-elf gcc-4.7.0-arm/gcc/config/arm/t-ar
  #MULTILIB_EXCEPTIONS    += *mcpu=fa526/*mfloat-abi=hard*
  #MULTILIB_EXCEPTIONS    += *mcpu=fa626/*mfloat-abi=hard*
  
-@@ -49,9 +71,9 @@
+@@ -48,9 +70,9 @@
  # MULTILIB_DIRNAMES   += ep9312
  # MULTILIB_EXCEPTIONS += *mthumb/*mcpu=ep9312*
  # 	
@@ -71,19 +71,19 @@ diff -Nbaur gcc-4.7.0/gcc/config/arm/t-arm-elf gcc-4.7.0-arm/gcc/config/arm/t-ar
  # 
  # MULTILIB_OPTIONS    += mfloat-abi=hard/mfloat-abi=soft
  # MULTILIB_DIRNAMES   += fpu soft
-diff -Nbaur gcc-4.7.0/gcc/config/arm/unknown-elf.h gcc-4.7.0-arm/gcc/config/arm/unknown-elf.h
---- gcc-4.7.0/gcc/config/arm/unknown-elf.h	2011-03-31 13:13:13.000000000 +0100
-+++ gcc-4.7.0-arm/gcc/config/arm/unknown-elf.h	2012-04-05 20:36:17.000000000 +0100
-@@ -94,4 +94,4 @@
+diff -Nbaur gcc-4.8.2/gcc/config/arm/unknown-elf.h gcc-4.8.2-arm/gcc/config/arm/unknown-elf.h
+--- gcc-4.8.2/gcc/config/arm/unknown-elf.h	2013-01-10 20:38:27.000000000 +0000
++++ gcc-4.8.2-arm/gcc/config/arm/unknown-elf.h	2014-02-16 19:36:15.000000000 +0000
+@@ -93,4 +93,4 @@
     udivmoddi4, which will depend on the exception unwind routines,
     which will depend on abort, which is defined in libc.  */ 
  #undef LINK_GCC_C_SEQUENCE_SPEC
 -#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L --end-group"
 +#define LINK_GCC_C_SEQUENCE_SPEC "--start-group %G %L %(libgloss) --end-group"
-diff -Nbaur gcc-4.7.0/gcc/gcc.c gcc-4.7.0-arm/gcc/gcc.c
---- gcc-4.7.0/gcc/gcc.c	2012-02-28 17:31:38.000000000 +0000
-+++ gcc-4.7.0-arm/gcc/gcc.c	2012-04-05 20:36:17.000000000 +0100
-@@ -548,6 +548,11 @@
+diff -Nbaur gcc-4.8.2/gcc/gcc.c gcc-4.8.2-arm/gcc/gcc.c
+--- gcc-4.8.2/gcc/gcc.c	2013-05-17 13:24:26.000000000 +0100
++++ gcc-4.8.2-arm/gcc/gcc.c	2014-02-16 19:36:15.000000000 +0000
+@@ -599,6 +599,11 @@
  #endif
  #endif
  
@@ -95,7 +95,7 @@ diff -Nbaur gcc-4.7.0/gcc/gcc.c gcc-4.7.0-arm/gcc/gcc.c
  /* config.h can define STARTFILE_SPEC to override the default crt0 files.  */
  #ifndef STARTFILE_SPEC
  #define STARTFILE_SPEC  \
-@@ -717,6 +722,7 @@
+@@ -785,6 +790,7 @@
  static const char *mflib_spec = MFLIB_SPEC;
  static const char *link_gomp_spec = "";
  static const char *libgcc_spec = LIBGCC_SPEC;
@@ -103,7 +103,7 @@ diff -Nbaur gcc-4.7.0/gcc/gcc.c gcc-4.7.0-arm/gcc/gcc.c
  static const char *endfile_spec = ENDFILE_SPEC;
  static const char *startfile_spec = STARTFILE_SPEC;
  static const char *linker_name_spec = LINKER_NAME;
-@@ -1201,6 +1207,7 @@
+@@ -1274,6 +1280,7 @@
    INIT_STATIC_SPEC ("mflib",			&mflib_spec),
    INIT_STATIC_SPEC ("link_gomp",		&link_gomp_spec),
    INIT_STATIC_SPEC ("libgcc",			&libgcc_spec),
@@ -111,10 +111,10 @@ diff -Nbaur gcc-4.7.0/gcc/gcc.c gcc-4.7.0-arm/gcc/gcc.c
    INIT_STATIC_SPEC ("startfile",		&startfile_spec),
    INIT_STATIC_SPEC ("cross_compile",		&cross_compile),
    INIT_STATIC_SPEC ("version",			&compiler_version),
-diff -Nbaur gcc-4.7.0/libcpp/Makefile.in gcc-4.7.0-arm/libcpp/Makefile.in
---- gcc-4.7.0/libcpp/Makefile.in	2012-03-22 07:37:39.000000000 +0000
-+++ gcc-4.7.0-arm/libcpp/Makefile.in	2012-04-05 20:36:17.000000000 +0100
-@@ -214,8 +214,7 @@
+diff -Nbaur gcc-4.8.2/libcpp/Makefile.in gcc-4.8.2-arm/libcpp/Makefile.in
+--- gcc-4.8.2/libcpp/Makefile.in	2013-10-16 08:27:58.000000000 +0100
++++ gcc-4.8.2-arm/libcpp/Makefile.in	2014-02-16 19:36:15.000000000 +0000
+@@ -207,8 +207,7 @@
  # Note that we put the dependencies into a .Tpo file, then move them
  # into place if the compile succeeds.  We need this because gcc does
  # not atomically write the dependency output file.
@@ -124,10 +124,19 @@ diff -Nbaur gcc-4.7.0/libcpp/Makefile.in gcc-4.7.0-arm/libcpp/Makefile.in
  else
  COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \
  	  $(depcomp) $(COMPILE.base)
-diff -Nbaur gcc-4.7.0/libgcc/crtstuff.c gcc-4.7.0-arm/libgcc/crtstuff.c
---- gcc-4.7.0/libgcc/crtstuff.c	2011-12-06 21:35:41.000000000 +0000
-+++ gcc-4.7.0-arm/libgcc/crtstuff.c	2012-04-05 20:36:50.000000000 +0100
-@@ -49,7 +49,7 @@
+diff -Nbaur gcc-4.8.2/libgcc/config/arm/t-bpabi gcc-4.8.2-arm/libgcc/config/arm/t-bpabi
+--- gcc-4.8.2/libgcc/config/arm/t-bpabi	2012-08-17 16:06:06.000000000 +0100
++++ gcc-4.8.2-arm/libgcc/config/arm/t-bpabi	2014-02-16 19:36:15.000000000 +0000
+@@ -17,4 +17,4 @@
+ # On ARM, specifying -fnon-call-exceptions will needlessly pull in
+ # the unwinder in simple programs which use 64-bit division.  Omitting
+ # the option is safe.
+-LIB2_DIVMOD_EXCEPTION_FLAGS := -fexceptions
++LIB2_DIVMOD_EXCEPTION_FLAGS := -fno-exceptions
+diff -Nbaur gcc-4.8.2/libgcc/crtstuff.c gcc-4.8.2-arm/libgcc/crtstuff.c
+--- gcc-4.8.2/libgcc/crtstuff.c	2013-02-04 19:06:20.000000000 +0000
++++ gcc-4.8.2-arm/libgcc/crtstuff.c	2014-02-16 19:36:15.000000000 +0000
+@@ -47,7 +47,7 @@
  
  /* Target machine header files require this define. */
  #define IN_LIBGCC2
@@ -136,27 +145,10 @@ diff -Nbaur gcc-4.7.0/libgcc/crtstuff.c gcc-4.7.0-arm/libgcc/crtstuff.c
  /* FIXME: Including auto-host is incorrect, but until we have
     identified the set of defines that need to go into auto-target.h,
     this will have to do.  */
-diff -Nbaur gcc-4.7.0/libgcc/Makefile.in gcc-4.7.0-arm/libgcc/Makefile.in
---- gcc-4.7.0/libgcc/Makefile.in	2011-11-22 03:01:02.000000000 +0000
-+++ gcc-4.7.0-arm/libgcc/Makefile.in	2012-04-05 20:36:17.000000000 +0100
-@@ -500,14 +500,14 @@
- lib2-divmod-o = $(patsubst %,%$(objext),$(LIB2_DIVMOD_FUNCS))
- $(lib2-divmod-o): %$(objext): $(srcdir)/libgcc2.c
- 	$(gcc_compile) -DL$* -c $< \
--	  -fexceptions -fnon-call-exceptions $(vis_hide)
-+	  -fno-exceptions -fnon-call-exceptions $(vis_hide)
- libgcc-objects += $(lib2-divmod-o)
- 
- ifeq ($(enable_shared),yes)
- lib2-divmod-s-o = $(patsubst %,%_s$(objext),$(LIB2_DIVMOD_FUNCS))
- $(lib2-divmod-s-o): %_s$(objext): $(srcdir)/libgcc2.c
- 	$(gcc_s_compile) -DL$* -c $< \
--	  -fexceptions -fnon-call-exceptions
-+	  -fno-exceptions -fnon-call-exceptions
- libgcc-s-objects += $(lib2-divmod-s-o)
- endif
- 
-@@ -810,7 +810,7 @@
+diff -Nbaur gcc-4.8.2/libgcc/Makefile.in gcc-4.8.2-arm/libgcc/Makefile.in
+--- gcc-4.8.2/libgcc/Makefile.in	2013-02-04 19:06:20.000000000 +0000
++++ gcc-4.8.2-arm/libgcc/Makefile.in	2014-02-16 19:36:15.000000000 +0000
+@@ -813,7 +813,7 @@
  # libgcc_eh.a, only LIB2ADDEH matters.  If we do, only LIB2ADDEHSTATIC and
  # LIB2ADDEHSHARED matter.  (Usually all three are identical.)
  

dkarm-eabi/patches/gdb-7.4.patch

@@ -1,33 +0,0 @@
-diff -Nbaur gdb-7.4/gdb/Makefile.in gdb-7.4-arm/gdb/Makefile.in
---- gdb-7.4/gdb/Makefile.in	2012-01-06 04:43:01.000000000 +0000
-+++ gdb-7.4-arm/gdb/Makefile.in	2012-02-28 03:07:12.000000000 +0000
-@@ -2195,10 +2195,10 @@
- # Note that we put the dependencies into a .Tpo file, then move them
- # into place if the compile succeeds.  We need this because gcc does
- # not atomically write the dependency output file.
--@GMAKE_TRUE@override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \
--@GMAKE_TRUE@	-MF $(DEPDIR)/$(basename $(@F)).Tpo
--@GMAKE_TRUE@override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \
--@GMAKE_TRUE@	$(DEPDIR)/$(basename $(@F)).Po
-+#@GMAKE_TRUE@override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \
-+#@GMAKE_TRUE@	-MF $(DEPDIR)/$(basename $(@F)).Tpo
-+#@GMAKE_TRUE@override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \
-+#@GMAKE_TRUE@	$(DEPDIR)/$(basename $(@F)).Po
- @GMAKE_TRUE@else
- @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \
- @GMAKE_TRUE@	DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)
-diff -Nbaur gdb-7.4/sim/common/Make-common.in gdb-7.4-arm/sim/common/Make-common.in
---- gdb-7.4/sim/common/Make-common.in	2012-01-06 04:54:38.000000000 +0000
-+++ gdb-7.4-arm/sim/common/Make-common.in	2012-02-28 03:07:41.000000000 +0000
-@@ -417,10 +417,7 @@
- # Note that we put the dependencies into a .Tpo file, then move them
- # into place if the compile succeeds.  We need this because gcc does
- # not atomically write the dependency output file.
--@GMAKE_TRUE@override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \
--@GMAKE_TRUE@	-MF $(DEPDIR)/$(basename $(@F)).Tpo
--@GMAKE_TRUE@override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \
--@GMAKE_TRUE@	$(DEPDIR)/$(basename $(@F)).Po
-+@GMAKE_TRUE@override COMPILE.post = -c -o $@
- @GMAKE_TRUE@else
- @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \
- @GMAKE_TRUE@	DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)

dkarm-eabi/rules/base_rules

@@ -1,36 +1,11 @@
-#---------------------------------------------------------------------------------
-# change shell on Snow Leopard
-#---------------------------------------------------------------------------------
-UNAME_S	:=	$(shell uname -s)
-UNAME_R	:=	$(shell uname -r)
+include $(DEVKITARM)/base_tools
 
-ifneq (,$(findstring Darwin,$(UNAME_S)))
-	ifneq (,$(findstring 10.8.0,$(UNAME_R)))
-		export SHELL=/bin/bash
-	endif
-endif
 #---------------------------------------------------------------------------------
-# path to tools
+# add portlibs path
 #---------------------------------------------------------------------------------
 export PORTLIBS	:=	$(DEVKITPRO)/portlibs/arm
-export PATH	:=	$(DEVKITARM)/bin:$(PORTLIBS)/bin:$(PATH)
+export PATH	:=	$(PORTLIBS)/bin:$(PATH)
 
-#---------------------------------------------------------------------------------
-# the prefix on the compiler executables
-#---------------------------------------------------------------------------------
-PREFIX		:=	arm-eabi-
-
-export CC	:=	$(PREFIX)gcc
-export CXX	:=	$(PREFIX)g++
-export AS	:=	$(PREFIX)as
-export AR	:=	$(PREFIX)ar
-export OBJCOPY	:=	$(PREFIX)objcopy
-
-ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
-
-ifneq (,$(ISVC))
-	ERROR_FILTER	:=	2>&1 | sed -e 's/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/g'
-endif
 
 #---------------------------------------------------------------------------------
 %.a:

dkarm-eabi/rules/base_tools

@@ -0,0 +1,34 @@
+#---------------------------------------------------------------------------------
+# change shell on Snow Leopard
+#---------------------------------------------------------------------------------
+UNAME_S	:=	$(shell uname -s)
+UNAME_R	:=	$(shell uname -r)
+
+ifneq (,$(findstring Darwin,$(UNAME_S)))
+	ifneq (,$(findstring 10.8.0,$(UNAME_R)))
+		export SHELL=/bin/bash
+	endif
+endif
+#---------------------------------------------------------------------------------
+# path to tools
+#---------------------------------------------------------------------------------
+export PATH	:=	$(DEVKITARM)/bin:$(PATH)
+
+#---------------------------------------------------------------------------------
+# the prefix on the compiler executables
+#---------------------------------------------------------------------------------
+PREFIX		:=	arm-none-eabi-
+
+export CC	:=	$(PREFIX)gcc
+export CXX	:=	$(PREFIX)g++
+export AS	:=	$(PREFIX)as
+export AR	:=	$(PREFIX)ar
+export OBJCOPY	:=	$(PREFIX)objcopy
+export STRIP	:=	$(PREFIX)strip
+export NM	:=	$(PREFIX)nm
+
+ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSIONSPATH))
+
+ifneq (,$(ISVC))
+	ERROR_FILTER	:=	2>&1 | sed -e 's/\(.[a-zA-Z]\+\):\([0-9]\+\):/\1(\2):/g'
+endif

dkarm-eabi/rules/ds_rules

@@ -11,11 +11,11 @@ GAME_TITLE	:=	$(notdir $(OUTPUT))
 endif
 
 ifeq ($(strip $(GAME_SUBTITLE1)),)
-GAME_SUBTITLE1	:=	www.devkitpro.org
+GAME_SUBTITLE1	:=	built with devkitARM
 endif
 
 ifeq ($(strip $(GAME_SUBTITLE2)),)
-GAME_SUBTITLE2	:=	www.drunkencoders.com
+GAME_SUBTITLE2	:=	http://devkitpro.org
 endif
 
 ifeq ($(strip $(GAME_ICON)),)

dkarm-eabi/scripts/build-crtls.sh

@@ -12,8 +12,8 @@ cp -v $BUILDSCRIPTDIR/dkarm-eabi/rules/* $prefix
 # Install and build the gba crt
 #---------------------------------------------------------------------------------
 
-cp -v $BUILDSCRIPTDIR/dkarm-eabi/crtls/* $prefix/arm-eabi/lib/
-cd $prefix/arm-eabi/lib/
+cp -v $BUILDSCRIPTDIR/dkarm-eabi/crtls/* $prefix/$target/lib/
+cd $prefix/$target/lib/
 $MAKE CRT=gba
 $MAKE CRT=gp32
 $MAKE CRT=er
@@ -22,11 +22,23 @@ $MAKE CRT=ds_arm7
 $MAKE CRT=ds_arm9
 $MAKE CRT=ds_cart
 
+cd $BUILDDIR/libgba-$LIBGBA_VER
+$MAKE || { echo "error building libgba"; exit 1; }
+$MAKE install || { echo "error installing libgba"; exit 1; }
+
 cd $BUILDDIR/libnds-$LIBNDS_VER
 $MAKE || { echo "error building libnds"; exit 1; }
 $MAKE install || { echo "error installing libnds"; exit 1; }
 
-cd $BUILDDIR/default-arm7-$DEFAULT_ARM7_VER
+cd $BUILDDIR/dswifi-$DSWIFI_VER
+$MAKE || { echo "error building dswifi"; exit 1; }
+$MAKE install || { echo "error installing dswifi"; exit 1; }
+
+cd $BUILDDIR/maxmod-$MAXMOD_VER
+$MAKE || { echo "error building maxmod"; exit 1; }
+$MAKE install || { echo "error installing maxmod"; exit 1; }
+
+cd $BUILDDIR/default_arm7-$DEFAULT_ARM7_VER
 $MAKE || { echo "error building default arm7"; exit 1; }
 $MAKE install || { echo "error installing default arm7"; exit 1; }
 
@@ -34,10 +46,6 @@ cd $BUILDDIR/libfat-$LIBFAT_VER
 $MAKE nds-install || { echo "error building nds libfat"; exit 1; }
 $MAKE gba-install || { echo "error installing gba libfat"; exit 1; }
 
-cd $BUILDDIR/maxmod-$MAXMOD_VER
-$MAKE || { echo "error building maxmod"; exit 1; }
-$MAKE install || { echo "error installing maxmod"; exit 1; }
-
 cd $BUILDDIR/libmirko-$LIBMIRKO_VER
 $MAKE || { echo "error building libmirko"; exit 1; }
 $MAKE install || { echo "error installing libmirko"; exit 1; }

dkarm-eabi/scripts/build-gcc.sh

@@ -34,13 +34,14 @@ cd $BUILDDIR
 #---------------------------------------------------------------------------------
 # build and install just the c compiler
 #---------------------------------------------------------------------------------
-mkdir -p $target/gcc-stage1
-cd $target/gcc-stage1
+mkdir -p $target/gcc
+cd $target/gcc
 
 if [ ! -f configured-gcc ]
 then
-	CFLAGS="$cflags" LDFLAGS="$ldflags" CFLAGS_FOR_TARGET="-O2" LDFLAGS_FOR_TARGET="" ../../gcc-$GCC_VER/configure \
+	CFLAGS="$cflags" CXXFLAGS="$cflags" LDFLAGS="$ldflags" CFLAGS_FOR_TARGET="-O2" CXXFLAGS_FOR_TARGET="-O2" LDFLAGS_FOR_TARGET="" ../../gcc-$GCC_VER/configure \
 		--enable-languages=c,c++,objc,obj-c++ \
+		--with-gnu-as --with-gnu-ld --with-gcc \
 		--with-march=armv4t\
 		--enable-poison-system-directories \
 		--enable-interwork --enable-multilib \
@@ -53,7 +54,7 @@ then
 		--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 		--prefix=$prefix \
 		--enable-lto $plugin_ld\
-		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 39" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 42" \
 		$CROSS_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
 	touch configured-gcc

dkppc/patches/binutils-2.22.patch

@@ -1,149 +0,0 @@
-diff -Nbaur binutils-2.22/bfd/bfd-in2.h binutils-2.22-ppc/bfd/bfd-in2.h
---- binutils-2.22/bfd/bfd-in2.h	2011-09-16 02:15:18.000000000 +0100
-+++ binutils-2.22-ppc/bfd/bfd-in2.h	2012-04-03 15:06:10.000000000 +0100
-@@ -38,6 +38,8 @@
- 
- #include "ansidecl.h"
- #include "symcat.h"
-+#include <sys/stat.h>
-+
- #if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
- #ifndef SABER
- /* This hack is to avoid a problem with some strict ANSI C preprocessors.
-@@ -308,8 +310,6 @@
-    && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE		\
-    && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
- 
--/* Forward define.  */
--struct stat;
- 
- typedef enum bfd_print_symbol
- {
-diff -Nbaur binutils-2.22/bfd/bfd-in.h binutils-2.22-ppc/bfd/bfd-in.h
---- binutils-2.22/bfd/bfd-in.h	2011-09-16 02:15:18.000000000 +0100
-+++ binutils-2.22-ppc/bfd/bfd-in.h	2012-04-03 15:06:10.000000000 +0100
-@@ -31,6 +31,8 @@
- 
- #include "ansidecl.h"
- #include "symcat.h"
-+#include <sys/stat.h>
-+
- #if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE)
- #ifndef SABER
- /* This hack is to avoid a problem with some strict ANSI C preprocessors.
-@@ -301,8 +303,6 @@
-    && (sec)->sec_info_type != ELF_INFO_TYPE_MERGE		\
-    && (sec)->sec_info_type != ELF_INFO_TYPE_JUST_SYMS)
- 
--/* Forward define.  */
--struct stat;
- 
- typedef enum bfd_print_symbol
- {
-diff -Nbaur binutils-2.22/bfd/config.in binutils-2.22-ppc/bfd/config.in
---- binutils-2.22/bfd/config.in	2011-05-12 08:41:40.000000000 +0100
-+++ binutils-2.22-ppc/bfd/config.in	2012-04-03 14:50:51.000000000 +0100
-@@ -245,6 +245,9 @@
- /* Define if <sys/procfs.h> has win32_pstatus_t. */
- #undef HAVE_WIN32_PSTATUS_T
- 
-+/* Define to 1 if you have the <windows.h> header file. */
-+#undef HAVE_WINDOWS_H
-+
- /* Define to 1 if you have the <zlib.h> header file. */
- #undef HAVE_ZLIB_H
- 
-diff -Nbaur binutils-2.22/bfd/configure binutils-2.22-ppc/bfd/configure
---- binutils-2.22/bfd/configure	2011-11-21 11:55:48.000000000 +0000
-+++ binutils-2.22-ppc/bfd/configure	2012-04-03 14:50:59.000000000 +0100
-@@ -13508,6 +13508,22 @@
- 
- fi
- 
-+
-+for ac_header in windows.h dlfcn.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether string.h and strings.h may both be included" >&5
- $as_echo_n "checking whether string.h and strings.h may both be included... " >&6; }
- if test "${gcc_cv_header_string+set}" = set; then :
-diff -Nbaur binutils-2.22/bfd/configure.in binutils-2.22-ppc/bfd/configure.in
---- binutils-2.22/bfd/configure.in	2011-11-21 11:55:46.000000000 +0000
-+++ binutils-2.22-ppc/bfd/configure.in	2012-04-03 14:51:23.000000000 +0100
-@@ -190,6 +190,9 @@
- GCC_HEADER_STDINT(bfd_stdint.h)
- AC_HEADER_TIME
- AC_HEADER_DIRENT
-+
-+AC_CHECK_HEADERS(windows.h dlfcn.h)
-+
- ACX_HEADER_STRING
- AC_CHECK_FUNCS(fcntl getpagesize setitimer sysconf fdopen getuid getgid fileno)
- AC_CHECK_FUNCS(strtoull)
-diff -Nbaur binutils-2.22/bfd/plugin.c binutils-2.22-ppc/bfd/plugin.c
---- binutils-2.22/bfd/plugin.c	2011-07-11 16:03:07.000000000 +0100
-+++ binutils-2.22-ppc/bfd/plugin.c	2012-04-03 14:51:32.000000000 +0100
-@@ -25,7 +25,13 @@
- #if BFD_SUPPORTS_PLUGINS
- 
- #include <assert.h>
-+#ifdef HAVE_DLFCN_H
- #include <dlfcn.h>
-+#elif defined (HAVE_WINDOWS_H)
-+#include <windows.h>
-+#else
-+#error Unknown how to handle dynamic-load-libraries.
-+#endif
- #include <stdarg.h>
- #include "plugin-api.h"
- #include "sysdep.h"
-@@ -34,6 +40,37 @@
- #include "libiberty.h"
- #include <dirent.h>
- 
-+#if !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H)
-+
-+#define RTLD_NOW 0      /* Dummy value.  */
-+
-+static void *
-+dlopen (const char *file, int mode ATTRIBUTE_UNUSED)
-+{
-+  return LoadLibrary (file);
-+}
-+
-+static void *
-+dlsym (void *handle, const char *name)
-+{
-+  return GetProcAddress (handle, name);
-+}
-+
-+static int ATTRIBUTE_UNUSED
-+dlclose (void *handle)
-+{
-+  FreeLibrary (handle);
-+  return 0;
-+}
-+
-+static const char *
-+dlerror (void)
-+{
-+  return "Unable to load DLL.";
-+}
-+
-+#endif /* !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H)  */
-+
- #define bfd_plugin_close_and_cleanup                  _bfd_generic_close_and_cleanup
- #define bfd_plugin_bfd_free_cached_info               _bfd_generic_bfd_free_cached_info
- #define bfd_plugin_new_section_hook                   _bfd_generic_new_section_hook

dkppc/patches/binutils-2.24.patch

@@ -0,0 +1,12 @@
+diff -Nbaur binutils-2.24/opcodes/ppc-opc.c binutils-2.24-ppc/opcodes/ppc-opc.c
+--- binutils-2.24/opcodes/ppc-opc.c	2013-11-04 15:33:40.000000000 +0000
++++ binutils-2.24-ppc/opcodes/ppc-opc.c	2014-04-01 14:22:06.000000000 +0100
+@@ -2735,7 +2735,7 @@
+ #define MFDEC1	PPC_OPCODE_POWER
+ #define MFDEC2	PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE | PPC_OPCODE_TITAN
+ #define BOOKE	PPC_OPCODE_BOOKE
+-#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS | PPC_OPCODE_VLE
++#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_EFS | PPC_OPCODE_VLE
+ #define PPCE300 PPC_OPCODE_E300
+ #define PPCSPE	PPC_OPCODE_SPE | PPC_OPCODE_VLE
+ #define PPCISEL PPC_OPCODE_ISEL | PPC_OPCODE_VLE

dkppc/patches/gcc-4.8.2.patch

@@ -1,7 +1,7 @@
-diff -Nbaur gcc-4.6.3/gcc/config/rs6000/rs6000.h gcc-4.6.3-ppc/gcc/config/rs6000/rs6000.h
---- gcc-4.6.3/gcc/config/rs6000/rs6000.h	2011-07-27 19:17:15.000000000 +0100
-+++ gcc-4.6.3-ppc/gcc/config/rs6000/rs6000.h	2012-04-21 22:54:04.000000000 +0100
-@@ -200,6 +200,7 @@
+diff -Nbaur gcc-4.8.2/gcc/config/rs6000/rs6000.h gcc-4.8.2-ppc/gcc/config/rs6000/rs6000.h
+--- gcc-4.8.2/gcc/config/rs6000/rs6000.h	2013-06-19 02:18:38.000000000 +0100
++++ gcc-4.8.2-ppc/gcc/config/rs6000/rs6000.h	2014-04-01 14:13:11.000000000 +0100
+@@ -195,6 +195,7 @@
    { "asm_cpu_476",		ASM_CPU_476_SPEC },			\
    SUBTARGET_EXTRA_SPECS
  
@@ -9,7 +9,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/rs6000.h gcc-4.6.3-ppc/gcc/config/rs6000
  /* -mcpu=native handling only makes sense with compiler running on
     an PowerPC chip.  If changing this condition, also change
     the condition in driver-rs6000.c.  */
-@@ -214,6 +215,8 @@
+@@ -209,6 +210,8 @@
  #else
  #define ASM_CPU_NATIVE_SPEC "%(asm_default)"
  #endif
@@ -18,10 +18,10 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/rs6000.h gcc-4.6.3-ppc/gcc/config/rs6000
  
  #ifndef CC1_CPU_SPEC
  #ifdef HAVE_LOCAL_CPU_DETECT
-diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/sysv4.h
---- gcc-4.6.3/gcc/config/rs6000/sysv4.h	2011-03-07 07:50:23.000000000 +0000
-+++ gcc-4.6.3-ppc/gcc/config/rs6000/sysv4.h	2012-04-21 22:54:04.000000000 +0100
-@@ -603,7 +603,11 @@
+diff -Nbaur gcc-4.8.2/gcc/config/rs6000/sysv4.h gcc-4.8.2-ppc/gcc/config/rs6000/sysv4.h
+--- gcc-4.8.2/gcc/config/rs6000/sysv4.h	2013-06-19 02:18:38.000000000 +0100
++++ gcc-4.8.2-ppc/gcc/config/rs6000/sysv4.h	2014-04-01 14:13:11.000000000 +0100
+@@ -570,7 +570,11 @@
  
  /* Default starting address if specified.  */
  #define LINK_START_SPEC "\
@@ -34,7 +34,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    myellowknife : %(link_start_yellowknife) ; \
    mmvme        : %(link_start_mvme)        ; \
    msim         : %(link_start_sim)         ; \
-@@ -641,7 +645,8 @@
+@@ -604,7 +608,8 @@
  
  /* Any specific OS flags.  */
  #define LINK_OS_SPEC "\
@@ -44,7 +44,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    myellowknife : %(link_os_yellowknife) ; \
    mmvme        : %(link_os_mvme)        ; \
    msim         : %(link_os_sim)         ; \
-@@ -660,7 +665,10 @@
+@@ -622,7 +627,10 @@
  /* Override rs6000.h definition.  */
  #undef	CPP_SPEC
  #define	CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
@@ -56,7 +56,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    myellowknife : %(cpp_os_yellowknife) ; \
    mmvme        : %(cpp_os_mvme)        ; \
    msim         : %(cpp_os_sim)         ; \
-@@ -675,7 +683,10 @@
+@@ -636,7 +644,10 @@
  
  #undef	STARTFILE_SPEC
  #define	STARTFILE_SPEC "\
@@ -68,7 +68,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    myellowknife : %(startfile_yellowknife) ; \
    mmvme        : %(startfile_mvme)        ; \
    msim         : %(startfile_sim)         ; \
-@@ -686,11 +697,12 @@
+@@ -646,11 +657,12 @@
    mcall-openbsd: %(startfile_openbsd)     ; \
                 : %(startfile_default)     }"
  
@@ -83,7 +83,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    myellowknife : %(lib_yellowknife) ; \
    mmvme        : %(lib_mvme)        ; \
    msim         : %(lib_sim)         ; \
-@@ -701,11 +713,12 @@
+@@ -660,11 +672,12 @@
    mcall-openbsd: %(lib_openbsd)     ; \
                 : %(lib_default)     }"
  
@@ -98,7 +98,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    myellowknife : %(endfile_yellowknife) ; \
    mmvme        : %(endfile_mvme)        ; \
    msim         : %(endfile_sim)         ; \
-@@ -722,16 +735,27 @@
+@@ -680,16 +693,27 @@
  
  /* Motorola ADS support.  */
  #define LIB_ADS_SPEC "--start-group -lads -lc --end-group"
@@ -126,7 +126,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
  
  /* Motorola Yellowknife support.  */
  #define LIB_YELLOWKNIFE_SPEC "--start-group -lyk -lc --end-group"
-@@ -926,6 +950,7 @@
+@@ -859,6 +883,7 @@
  #undef	SUBTARGET_EXTRA_SPECS
  #define	SUBTARGET_EXTRA_SPECS						\
    { "crtsavres_default",	CRTSAVRES_DEFAULT_SPEC },		\
@@ -134,7 +134,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    { "lib_ads",			LIB_ADS_SPEC },				\
    { "lib_yellowknife",		LIB_YELLOWKNIFE_SPEC },			\
    { "lib_mvme",			LIB_MVME_SPEC },			\
-@@ -936,6 +961,7 @@
+@@ -868,6 +893,7 @@
    { "lib_netbsd",		LIB_NETBSD_SPEC },			\
    { "lib_openbsd",		LIB_OPENBSD_SPEC },			\
    { "lib_default",		LIB_DEFAULT_SPEC },			\
@@ -142,7 +142,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    { "startfile_ads",		STARTFILE_ADS_SPEC },			\
    { "startfile_yellowknife",	STARTFILE_YELLOWKNIFE_SPEC },		\
    { "startfile_mvme",		STARTFILE_MVME_SPEC },			\
-@@ -946,6 +972,7 @@
+@@ -877,6 +903,7 @@
    { "startfile_netbsd",		STARTFILE_NETBSD_SPEC },		\
    { "startfile_openbsd",	STARTFILE_OPENBSD_SPEC },		\
    { "startfile_default",	STARTFILE_DEFAULT_SPEC },		\
@@ -150,7 +150,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    { "endfile_ads",		ENDFILE_ADS_SPEC },			\
    { "endfile_yellowknife",	ENDFILE_YELLOWKNIFE_SPEC },		\
    { "endfile_mvme",		ENDFILE_MVME_SPEC },			\
-@@ -959,7 +986,11 @@
+@@ -889,7 +916,11 @@
    { "link_shlib",		LINK_SHLIB_SPEC },			\
    { "link_target",		LINK_TARGET_SPEC },			\
    { "link_start",		LINK_START_SPEC },			\
@@ -162,7 +162,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    { "link_start_yellowknife",	LINK_START_YELLOWKNIFE_SPEC },		\
    { "link_start_mvme",		LINK_START_MVME_SPEC },			\
    { "link_start_sim",		LINK_START_SIM_SPEC },			\
-@@ -970,6 +1001,7 @@
+@@ -899,6 +930,7 @@
    { "link_start_openbsd",	LINK_START_OPENBSD_SPEC },		\
    { "link_start_default",	LINK_START_DEFAULT_SPEC },		\
    { "link_os",			LINK_OS_SPEC },				\
@@ -170,7 +170,7 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    { "link_os_ads",		LINK_OS_ADS_SPEC },			\
    { "link_os_yellowknife",	LINK_OS_YELLOWKNIFE_SPEC },		\
    { "link_os_mvme",		LINK_OS_MVME_SPEC },			\
-@@ -984,6 +1016,9 @@
+@@ -912,6 +944,9 @@
    { "cc1_endian_little",	CC1_ENDIAN_LITTLE_SPEC },		\
    { "cc1_endian_default",	CC1_ENDIAN_DEFAULT_SPEC },		\
    { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
@@ -180,10 +180,10 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.h gcc-4.6.3-ppc/gcc/config/rs6000/
    { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
    { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
    { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.opt gcc-4.6.3-ppc/gcc/config/rs6000/sysv4.opt
---- gcc-4.6.3/gcc/config/rs6000/sysv4.opt	2011-01-03 20:52:22.000000000 +0000
-+++ gcc-4.6.3-ppc/gcc/config/rs6000/sysv4.opt	2012-04-21 22:54:04.000000000 +0100
-@@ -108,6 +108,26 @@
+diff -Nbaur gcc-4.8.2/gcc/config/rs6000/sysv4.opt gcc-4.8.2-ppc/gcc/config/rs6000/sysv4.opt
+--- gcc-4.8.2/gcc/config/rs6000/sysv4.opt	2013-01-10 20:38:27.000000000 +0000
++++ gcc-4.8.2-ppc/gcc/config/rs6000/sysv4.opt	2014-04-01 14:13:11.000000000 +0100
+@@ -120,6 +120,26 @@
  Target RejectNegative
  Link with libads.a, libc.a and crt0.o
  
@@ -210,22 +210,22 @@ diff -Nbaur gcc-4.6.3/gcc/config/rs6000/sysv4.opt gcc-4.6.3-ppc/gcc/config/rs600
  myellowknife
  Target RejectNegative
  Link with libyk.a, libc.a and crt0.o
-diff -Nbaur gcc-4.6.3/gcc/config.gcc gcc-4.6.3-ppc/gcc/config.gcc
---- gcc-4.6.3/gcc/config.gcc	2011-07-22 17:44:50.000000000 +0100
-+++ gcc-4.6.3-ppc/gcc/config.gcc	2012-04-21 22:54:04.000000000 +0100
-@@ -2133,7 +2133,7 @@
+diff -Nbaur gcc-4.8.2/gcc/config.gcc gcc-4.8.2-ppc/gcc/config.gcc
+--- gcc-4.8.2/gcc/config.gcc	2013-10-03 01:47:24.000000000 +0100
++++ gcc-4.8.2-ppc/gcc/config.gcc	2014-04-01 14:13:11.000000000 +0100
+@@ -2057,7 +2057,7 @@
  	use_gcc_stdint=wrap
  	;;
  powerpc-*-eabi*)
 -	tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
 +	tm_file="${tm_file} dbxelf.h elfos.h usegas.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/750cl.h"
  	extra_options="${extra_options} rs6000/sysv4.opt"
- 	tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+ 	tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
  	use_gcc_stdint=wrap
-diff -Nbaur gcc-4.6.3/libcpp/Makefile.in gcc-4.6.3-ppc/libcpp/Makefile.in
---- gcc-4.6.3/libcpp/Makefile.in	2012-03-01 12:03:46.000000000 +0000
-+++ gcc-4.6.3-ppc/libcpp/Makefile.in	2012-04-21 22:54:04.000000000 +0100
-@@ -212,8 +212,7 @@
+diff -Nbaur gcc-4.8.2/libcpp/Makefile.in gcc-4.8.2-ppc/libcpp/Makefile.in
+--- gcc-4.8.2/libcpp/Makefile.in	2013-10-16 08:27:58.000000000 +0100
++++ gcc-4.8.2-ppc/libcpp/Makefile.in	2014-04-01 14:13:11.000000000 +0100
+@@ -207,8 +207,7 @@
  # Note that we put the dependencies into a .Tpo file, then move them
  # into place if the compile succeeds.  We need this because gcc does
  # not atomically write the dependency output file.
@@ -235,3 +235,48 @@ diff -Nbaur gcc-4.6.3/libcpp/Makefile.in gcc-4.6.3-ppc/libcpp/Makefile.in
  else
  COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \
  	  $(depcomp) $(COMPILE.base)
+diff -Nbaur gcc-4.8.2/libgcc/config/rs6000/crtrestvr.S gcc-4.8.2-ppc/libgcc/config/rs6000/crtrestvr.S
+--- gcc-4.8.2/libgcc/config/rs6000/crtrestvr.S	2013-02-04 19:06:20.000000000 +0000
++++ gcc-4.8.2-ppc/libgcc/config/rs6000/crtrestvr.S	2014-04-01 14:13:11.000000000 +0100
+@@ -24,7 +24,7 @@
+ 
+ /* On PowerPC64 Linux, these functions are provided by the linker.  */
+ #ifndef __powerpc64__
+-
++#if 0
+ #undef __ALTIVEC__
+ #define __ALTIVEC__ 1
+ 	#include "ppc-asm.h"
+@@ -85,3 +85,4 @@
+ CFI_ENDPROC
+ 
+ #endif
++#endif
+diff -Nbaur gcc-4.8.2/libgcc/config/rs6000/crtsavevr.S gcc-4.8.2-ppc/libgcc/config/rs6000/crtsavevr.S
+--- gcc-4.8.2/libgcc/config/rs6000/crtsavevr.S	2013-02-04 19:06:20.000000000 +0000
++++ gcc-4.8.2-ppc/libgcc/config/rs6000/crtsavevr.S	2014-04-01 14:13:11.000000000 +0100
+@@ -24,6 +24,7 @@
+ 
+ /* On PowerPC64 Linux, these functions are provided by the linker.  */
+ #ifndef __powerpc64__
++#if 0
+ 
+ #undef __ALTIVEC__
+ #define __ALTIVEC__ 1
+@@ -85,3 +86,4 @@
+ CFI_ENDPROC
+ 
+ #endif
++#endif
+diff -Nbaur gcc-4.8.2/libgcc/crtstuff.c gcc-4.8.2-ppc/libgcc/crtstuff.c
+--- gcc-4.8.2/libgcc/crtstuff.c	2013-02-04 19:06:20.000000000 +0000
++++ gcc-4.8.2-ppc/libgcc/crtstuff.c	2014-04-01 14:13:11.000000000 +0100
+@@ -47,7 +47,7 @@
+ 
+ /* Target machine header files require this define. */
+ #define IN_LIBGCC2
+-
++#define USED_FOR_TARGET
+ /* FIXME: Including auto-host is incorrect, but until we have
+    identified the set of defines that need to go into auto-target.h,
+    this will have to do.  */

dkppc/patches/gdb-7.7.patch

@@ -1,7 +1,7 @@
-diff -Nbaur gdb-7.4/gdb/Makefile.in gdb-7.4-ppc/gdb/Makefile.in
---- gdb-7.4/gdb/Makefile.in	2012-01-06 04:43:01.000000000 +0000
-+++ gdb-7.4-ppc/gdb/Makefile.in	2012-01-28 15:56:00.000000000 +0000
-@@ -2195,10 +2195,10 @@
+diff -Nbaur gdb-7.7/gdb/Makefile.in gdb-7.7-ppc/gdb/Makefile.in
+--- gdb-7.7/gdb/Makefile.in	2014-02-06 02:21:29.000000000 +0000
++++ gdb-7.7-ppc/gdb/Makefile.in	2014-04-01 14:01:24.000000000 +0100
+@@ -2307,10 +2307,10 @@
  # Note that we put the dependencies into a .Tpo file, then move them
  # into place if the compile succeeds.  We need this because gcc does
  # not atomically write the dependency output file.
@@ -16,10 +16,10 @@ diff -Nbaur gdb-7.4/gdb/Makefile.in gdb-7.4-ppc/gdb/Makefile.in
  @GMAKE_TRUE@else
  @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \
  @GMAKE_TRUE@	DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)
-diff -Nbaur gdb-7.4/sim/ppc/Makefile.in gdb-7.4-ppc/sim/ppc/Makefile.in
---- gdb-7.4/sim/ppc/Makefile.in	2009-09-16 00:26:44.000000000 +0100
-+++ gdb-7.4-ppc/sim/ppc/Makefile.in	2012-02-25 13:30:02.000000000 +0000
-@@ -551,7 +551,7 @@
+diff -Nbaur gdb-7.7/sim/ppc/Makefile.in gdb-7.7-ppc/sim/ppc/Makefile.in
+--- gdb-7.7/sim/ppc/Makefile.in	2013-12-08 04:55:48.000000000 +0000
++++ gdb-7.7-ppc/sim/ppc/Makefile.in	2014-04-01 14:01:24.000000000 +0100
+@@ -552,7 +552,7 @@
  PACKAGE_OBJ = @sim_pk_obj@
  
  

dkppc/scripts/build-gcc.sh

@@ -75,7 +75,7 @@ cd $target/gcc
 
 if [ ! -f configured-gcc ]
 then
-	CFLAGS="$cflags" LDFLAGS="$ldflags" CFLAGS_FOR_TARGET="-O2" LDFLAGS_FOR_TARGET="" ../../gcc-$GCC_VER/configure \
+	CFLAGS="$cflags" CXXFLAGS="$cflags" LDFLAGS="$ldflags" CFLAGS_FOR_TARGET="-O2" CXXFLAGS_FOR_TARGET="-O2" LDFLAGS_FOR_TARGET="" ../../gcc-$GCC_VER/configure \
 	--enable-languages=c,c++,objc \
 	--enable-lto $plugin_ld \
 	--with-cpu=750 \
@@ -87,7 +87,7 @@ then
 	--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 	--prefix=$prefix\
 	--disable-dependency-tracking \
-	--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitPPC release 26" \
+	--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitPPC release 27" \
 	$CROSS_PARAMS \
 	|| { echo "Error configuring gcc stage 1"; exit 1; }
 	touch configured-gcc

select_toolchain.sh

@@ -1,5 +1,17 @@
 #!/bin/bash
 VERSION=0
+case "$BUILD_DKPRO_PACKAGE" in
+  "1" )
+    VERSION=1
+  ;;
+  "2" )
+    VERSION=2
+  ;;
+  "3" )
+    VERSION=3
+  ;;
+esac
+
 while [ $VERSION -eq 0 ]
 do
   echo
@@ -18,20 +30,20 @@ done
 
 case "$VERSION" in
   "1" )
-    GCC_VER=4.7.0
-    BINUTILS_VER=2.22
-    NEWLIB_VER=1.20.0
-    GDB_VER=7.4
+    GCC_VER=4.8.2
+    BINUTILS_VER=2.24
+    NEWLIB_VER=2.1.0
+    GDB_VER=7.7
     basedir='dkarm-eabi'
     package=devkitARM
-    target=arm-eabi
+    target=arm-none-eabi
     toolchain=DEVKITARM
   ;;
   "2" )
-    GCC_VER=4.6.3
-    BINUTILS_VER=2.22
-    NEWLIB_VER=1.20.0
-    GDB_VER=7.4
+    GCC_VER=4.8.2
+    BINUTILS_VER=2.24
+    NEWLIB_VER=2.0.0
+    GDB_VER=7.7
     basedir='dkppc'
     package=devkitPPC
     target=powerpc-eabi
@@ -47,4 +59,4 @@ case "$VERSION" in
     target=psp
     toolchain=DEVKITPSP
   ;;
-esac
+esac

strip_bins.sh

@@ -19,6 +19,10 @@ do
 	then
 		$HOST_STRIP $f
 	fi
+	if [[ "$f" == *.dll ]]
+	then
+		$HOST_STRIP -d $f
+	fi
 done
 
 if [ $VERSION -eq 2 ]; then