make devkitPSP build again

2026-08-21 01:44:16 -05:00 · 2018-06-05 23:31:45 +00:00
10 changed files with 166 additions and 159 deletions
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #---------------------------------------------------------------------------------
 # Build scripts for
-#	devkitARM release 41
+#	devkitARM release 38
 #	devkitPPC release 26
 #	devkitPSP release 17
 #---------------------------------------------------------------------------------
@@ -11,8 +11,8 @@ if [ 0 -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 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."
+	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."
 	exit 1
 fi

@@ -24,9 +24,9 @@ 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.11
+LIBOGC_VER=1.8.10
 LIBGBA_VER=20090222
-LIBNDS_VER=1.5.7
+LIBNDS_VER=1.5.5
 DEFAULT_ARM7_VER=0.5.24
 DSWIFI_VER=0.3.13
 LIBMIRKO_VER=0.9.7
@@ -44,8 +44,6 @@ GCDSPSUITE_VER=1.4.0
 ELF2DOL_VER=1.0.0
 WIILOAD_VER=0.5.1
 MMUTIL_VER=1.8.6
-DFU_UTIL_VER=0.6
-STLINK_VER=0.5.4

 #---------------------------------------------------------------------------------
 function extract_and_patch {
@@ -153,10 +151,6 @@ else
 	prefix=$INSTALLDIR/$package
 fi

-if [ "$CROSSBUILD" = "i686-w64-mingw32" ]; then
-	export PKG_CONFIG_PATH=/opt/i686-w64-mingw32/mingw/lib/pkgconfig
-fi
-
 if [ "$BUILD_DKPRO_AUTOMATED" != "1" ] ; then

 	echo
@@ -187,7 +181,7 @@ BUILDDIR=$(pwd)/.$package
 if [ ! -z $CROSSBUILD ]; then
 	BUILDDIR=$BUILDDIR-$CROSSBUILD
 fi
-DEVKITPRO_URL="http://downloads.sourceforge.net/devkitpro"
+DEVKITPRO_URL="https://downloads.devkitpro.org"

 patchdir=$(pwd)/$basedir/patches
 scriptdir=$(pwd)/$basedir/scripts
@@ -200,8 +194,7 @@ if [ $VERSION -eq 1 ]; then
 		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
-		dfu-util-$DFU_UTIL_VER.tar.bz2 stlink-$STLINK_VER.tar.bz2"
+		general-tools-$GENERAL_TOOLS_VER.tar.bz2 dlditool-$DLDITOOL_VER.tar.bz2 mmutil-$MMUTIL_VER.tar.bz2"
 fi

 if [ $VERSION -eq 2 ]; then
@@ -225,7 +218,7 @@ for archive in $archives $targetarchives $hostarchives
 do
 	echo $archive
 	if [ ! -f $archive ]; then
-		$FETCH http://downloads.sf.net/devkitpro/$archive || { echo "Error: Failed to download $archive"; exit 1; }
+		$FETCH $DEVKITPRO_URL/$archive || { echo "Error: Failed to download $archive"; exit 1; }
 	fi
 done

@@ -265,9 +258,6 @@ if [ "$CROSSBUILD" = "i686-w64-mingw32" ]; then
 	if [ $VERSION -ne 3 ]; then
 		cp -v 	/opt/i686-w64-mingw32/mingw/lib/FreeImage.dll $prefix/bin
 	fi
-	if [ $VERSION -eq 1 ]; then
-		cp -v /opt/i686-w64-mingw32/i686-w64-mingw32/bin/libusb-1.0.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 \
 		$prefix/bin
--- a/dkarm-eabi/patches/gcc-4.7.0.patch
+++ b/dkarm-eabi/patches/gcc-4.7.0.patch
@@ -1,6 +1,6 @@
-diff -Nbaur gcc-4.7.1/gcc/config/arm/t-arm-elf gcc-4.7.1-arm/gcc/config/arm/t-arm-elf
--- gcc-4.7.1/gcc/config/arm/t-arm-elf	2011-11-02 15:23:48.000000000 +0000
-+++ gcc-4.7.1-arm/gcc/config/arm/t-arm-elf	2012-06-15 19:36:09.000000000 +0100
+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 @@
 #MULTILIB_DIRNAMES    += fa526 fa626 fa606te fa626te fmp626 fa726te
 #MULTILIB_EXCEPTIONS  += *mthumb*/*mcpu=fa526 *mthumb*/*mcpu=fa626
@@ -71,18 +71,18 @@ diff -Nbaur gcc-4.7.1/gcc/config/arm/t-arm-elf gcc-4.7.1-arm/gcc/config/arm/t-ar
 # 
 # MULTILIB_OPTIONS    += mfloat-abi=hard/mfloat-abi=soft
 # MULTILIB_DIRNAMES   += fpu soft
-diff -Nbaur gcc-4.7.1/gcc/config/arm/unknown-elf.h gcc-4.7.1-arm/gcc/config/arm/unknown-elf.h
--- gcc-4.7.1/gcc/config/arm/unknown-elf.h	2011-03-31 13:13:13.000000000 +0100
-+++ gcc-4.7.1-arm/gcc/config/arm/unknown-elf.h	2012-06-15 19:36:09.000000000 +0100
+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 @@
    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.1/gcc/gcc.c gcc-4.7.1-arm/gcc/gcc.c
--- gcc-4.7.1/gcc/gcc.c	2012-02-28 17:31:38.000000000 +0000
-+++ gcc-4.7.1-arm/gcc/gcc.c	2012-06-15 19:36:09.000000000 +0100
+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 @@
 #endif
 #endif
@@ -111,9 +111,9 @@ diff -Nbaur gcc-4.7.1/gcc/gcc.c gcc-4.7.1-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.1/libcpp/Makefile.in gcc-4.7.1-arm/libcpp/Makefile.in
--- gcc-4.7.1/libcpp/Makefile.in	2012-06-14 09:48:08.000000000 +0100
-+++ gcc-4.7.1-arm/libcpp/Makefile.in	2012-06-15 19:36:11.000000000 +0100
+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 @@
 # 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
@@ -124,15 +124,27 @@ diff -Nbaur gcc-4.7.1/libcpp/Makefile.in gcc-4.7.1-arm/libcpp/Makefile.in
 else
 COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \
 	  $(depcomp) $(COMPILE.base)
-diff -Nbaur gcc-4.7.1/libgcc/Makefile.in gcc-4.7.1-arm/libgcc/Makefile.in
--- gcc-4.7.1/libgcc/Makefile.in	2012-05-24 15:59:38.000000000 +0100
-+++ gcc-4.7.1-arm/libgcc/Makefile.in	2012-06-16 13:58:38.000000000 +0100
+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 @@
+ 
+ /* 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.  */
+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 -fno-non-call-exceptions $(vis_hide)
+	  -fno-exceptions -fnon-call-exceptions $(vis_hide)
 libgcc-objects += $(lib2-divmod-o)
 
 ifeq ($(enable_shared),yes)
@@ -140,7 +152,7 @@ diff -Nbaur gcc-4.7.1/libgcc/Makefile.in gcc-4.7.1-arm/libgcc/Makefile.in
 $(lib2-divmod-s-o): %_s$(objext): $(srcdir)/libgcc2.c
 	$(gcc_s_compile) -DL$* -c $< \
 -	  -fexceptions -fnon-call-exceptions
-+	  -fno-exceptions -fno-non-call-exceptions
+	  -fno-exceptions -fnon-call-exceptions
 libgcc-s-objects += $(lib2-divmod-s-o)
 endif
 
@@ -153,15 +165,3 @@ diff -Nbaur gcc-4.7.1/libgcc/Makefile.in gcc-4.7.1-arm/libgcc/Makefile.in
 
 ifeq ($(enable_shared),yes)
 
-diff -Nbaur gcc-4.7.1/libgcc/crtstuff.c gcc-4.7.1-arm/libgcc/crtstuff.c
--- gcc-4.7.1/libgcc/crtstuff.c	2011-12-06 21:35:41.000000000 +0000
-+++ gcc-4.7.1-arm/libgcc/crtstuff.c	2012-06-15 19:36:11.000000000 +0100
-@@ -49,7 +49,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.  */
--- a/dkarm-eabi/patches/gdb-7.4.1.patch
+++ b/dkarm-eabi/patches/gdb-7.4.1.patch
@@ -1,7 +1,25 @@
-diff -Nbaur gdb-7.4.1/gdb/Makefile.in gdb-7.4.1-arm/gdb/Makefile.in
--- gdb-7.4.1/gdb/Makefile.in	2012-01-06 04:43:01.000000000 +0000
-+++ gdb-7.4.1-arm/gdb/Makefile.in	2012-06-18 11:40:57.000000000 +0100
-@@ -2195,10 +2195,8 @@
+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.
@@ -10,23 +28,6 @@ diff -Nbaur gdb-7.4.1/gdb/Makefile.in gdb-7.4.1-arm/gdb/Makefile.in
 -@GMAKE_TRUE@override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \
 -@GMAKE_TRUE@	$(DEPDIR)/$(basename $(@F)).Po
 +@GMAKE_TRUE@override COMPILE.post = -c -o $@
-+@GMAKE_TRUE@override POSTCOMPILE =
- @GMAKE_TRUE@else
- @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \
- @GMAKE_TRUE@	DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)
-diff -Nbaur gdb-7.4.1/sim/common/Make-common.in gdb-7.4.1-arm/sim/common/Make-common.in
--- gdb-7.4.1/sim/common/Make-common.in	2012-01-06 04:54:38.000000000 +0000
-+++ gdb-7.4.1-arm/sim/common/Make-common.in	2012-06-18 11:25:26.000000000 +0100
-@@ -417,10 +417,8 @@
- # 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@override POSTCOMPILE =
 @GMAKE_TRUE@else
 @GMAKE_TRUE@override COMPILE.pre = source='$<' object='$@' libtool=no \
 @GMAKE_TRUE@	DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)
--- a/dkarm-eabi/rules/base_rules
+++ b/dkarm-eabi/rules/base_rules
@@ -18,7 +18,7 @@ export PATH	:=	$(DEVKITARM)/bin:$(PORTLIBS)/bin:$(PATH)
 #---------------------------------------------------------------------------------
 # the prefix on the compiler executables
 #---------------------------------------------------------------------------------
-PREFIX		:=	arm-none-eabi-
+PREFIX		:=	arm-eabi-

 export CC	:=	$(PREFIX)gcc
 export CXX	:=	$(PREFIX)g++
--- a/dkarm-eabi/scripts/build-crtls.sh
+++ b/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/$target/lib/
-cd $prefix/$target/lib/
+cp -v $BUILDSCRIPTDIR/dkarm-eabi/crtls/* $prefix/arm-eabi/lib/
+cd $prefix/arm-eabi/lib/
 $MAKE CRT=gba
 $MAKE CRT=gp32
 $MAKE CRT=er
@@ -26,10 +26,6 @@ cd $BUILDDIR/libnds-$LIBNDS_VER
 $MAKE || { echo "error building libnds"; exit 1; }
 $MAKE install || { echo "error installing libnds"; exit 1; }

-cd $BUILDDIR/dswifi-$DSWIFI_VER
-$MAKE || { echo "error building dswifi"; exit 1; }
-$MAKE install || { echo "error installing dswifi"; 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; }
--- a/dkarm-eabi/scripts/build-gcc.sh
+++ b/dkarm-eabi/scripts/build-gcc.sh
@@ -34,14 +34,13 @@ cd $BUILDDIR
 #---------------------------------------------------------------------------------
 # build and install just the c compiler
 #---------------------------------------------------------------------------------
-mkdir -p $target/gcc
-cd $target/gcc
+mkdir -p $target/gcc-stage1
+cd $target/gcc-stage1

 if [ ! -f configured-gcc ]
 then
 	CFLAGS="$cflags" LDFLAGS="$ldflags" CFLAGS_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 \
@@ -54,7 +53,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 41" \
+		--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitARM release 39" \
 		$CROSS_PARAMS \
 		|| { echo "Error configuring gcc"; exit 1; }
 	touch configured-gcc
--- a/dkpsp/patches/binutils-2.22.patch
+++ b/dkpsp/patches/binutils-2.22.patch
@@ -1,6 +1,6 @@
 diff -Nbaur binutils-2.22/bfd/archures.c binutils-2.22-psp/bfd/archures.c
--- binutils-2.22/bfd/archures.c	2011-08-02 00:04:19.000000000 +0100
-+++ binutils-2.22-psp/bfd/archures.c	2012-04-03 22:08:06.000000000 +0100
+--- binutils-2.22/bfd/archures.c	2011-08-01 23:04:19.000000000 +0000
+++ binutils-2.22-psp/bfd/archures.c	2018-06-05 22:45:23.845890519 +0000
@@ -175,6 +175,7 @@
 .#define bfd_mach_mips_loongson_2f      3002
 .#define bfd_mach_mips_loongson_3a      3003
@@ -10,8 +10,8 @@ diff -Nbaur binutils-2.22/bfd/archures.c binutils-2.22-psp/bfd/archures.c
 .#define bfd_mach_mips_xlr              887682   {* decimal 'XLR'  *}
 .#define bfd_mach_mipsisa32             32
 diff -Nbaur binutils-2.22/bfd/bfd-in2.h binutils-2.22-psp/bfd/bfd-in2.h
--- binutils-2.22/bfd/bfd-in2.h	2011-09-16 02:15:18.000000000 +0100
-+++ binutils-2.22-psp/bfd/bfd-in2.h	2012-04-03 22:12:53.000000000 +0100
+--- binutils-2.22/bfd/bfd-in2.h	2011-09-16 01:15:18.000000000 +0000
+++ binutils-2.22-psp/bfd/bfd-in2.h	2018-06-05 22:45:23.845890519 +0000
@@ -38,6 +38,8 @@
 
 #include "ansidecl.h"
@@ -39,8 +39,8 @@ diff -Nbaur binutils-2.22/bfd/bfd-in2.h binutils-2.22-psp/bfd/bfd-in2.h
 #define bfd_mach_mips_xlr              887682   /* decimal 'XLR'  */
 #define bfd_mach_mipsisa32             32
 diff -Nbaur binutils-2.22/bfd/bfd-in.h binutils-2.22-psp/bfd/bfd-in.h
--- binutils-2.22/bfd/bfd-in.h	2011-09-16 02:15:18.000000000 +0100
-+++ binutils-2.22-psp/bfd/bfd-in.h	2012-04-03 22:12:53.000000000 +0100
+--- binutils-2.22/bfd/bfd-in.h	2011-09-16 01:15:18.000000000 +0000
+++ binutils-2.22-psp/bfd/bfd-in.h	2018-06-05 22:45:23.845890519 +0000
@@ -31,6 +31,8 @@
 
 #include "ansidecl.h"
@@ -60,8 +60,8 @@ diff -Nbaur binutils-2.22/bfd/bfd-in.h binutils-2.22-psp/bfd/bfd-in.h
 typedef enum bfd_print_symbol
 {
 diff -Nbaur binutils-2.22/bfd/config.in binutils-2.22-psp/bfd/config.in
--- binutils-2.22/bfd/config.in	2011-05-12 08:41:40.000000000 +0100
-+++ binutils-2.22-psp/bfd/config.in	2012-04-03 22:12:53.000000000 +0100
+--- binutils-2.22/bfd/config.in	2011-05-12 07:41:40.000000000 +0000
+++ binutils-2.22-psp/bfd/config.in	2018-06-05 22:45:23.845890519 +0000
@@ -245,6 +245,9 @@
 /* Define if <sys/procfs.h> has win32_pstatus_t. */
 #undef HAVE_WIN32_PSTATUS_T
@@ -74,7 +74,7 @@ diff -Nbaur binutils-2.22/bfd/config.in binutils-2.22-psp/bfd/config.in
 
 diff -Nbaur binutils-2.22/bfd/configure binutils-2.22-psp/bfd/configure
 --- binutils-2.22/bfd/configure	2011-11-21 11:55:48.000000000 +0000
-+++ binutils-2.22-psp/bfd/configure	2012-04-03 22:12:53.000000000 +0100
+++ binutils-2.22-psp/bfd/configure	2018-06-05 22:45:23.849891511 +0000
@@ -13508,6 +13508,22 @@
 
 fi
@@ -100,7 +100,7 @@ diff -Nbaur binutils-2.22/bfd/configure binutils-2.22-psp/bfd/configure
 if test "${gcc_cv_header_string+set}" = set; then :
 diff -Nbaur binutils-2.22/bfd/configure.in binutils-2.22-psp/bfd/configure.in
 --- binutils-2.22/bfd/configure.in	2011-11-21 11:55:46.000000000 +0000
-+++ binutils-2.22-psp/bfd/configure.in	2012-04-03 22:12:53.000000000 +0100
+++ binutils-2.22-psp/bfd/configure.in	2018-06-05 22:45:23.849891511 +0000
@@ -190,6 +190,9 @@
 GCC_HEADER_STDINT(bfd_stdint.h)
 AC_HEADER_TIME
@@ -112,8 +112,8 @@ diff -Nbaur binutils-2.22/bfd/configure.in binutils-2.22-psp/bfd/configure.in
 AC_CHECK_FUNCS(fcntl getpagesize setitimer sysconf fdopen getuid getgid fileno)
 AC_CHECK_FUNCS(strtoull)
 diff -Nbaur binutils-2.22/bfd/cpu-mips.c binutils-2.22-psp/bfd/cpu-mips.c
--- binutils-2.22/bfd/cpu-mips.c	2011-07-24 15:20:05.000000000 +0100
-+++ binutils-2.22-psp/bfd/cpu-mips.c	2012-04-03 22:08:06.000000000 +0100
+--- binutils-2.22/bfd/cpu-mips.c	2011-07-24 14:20:05.000000000 +0000
+++ binutils-2.22-psp/bfd/cpu-mips.c	2018-06-05 22:45:23.849891511 +0000
@@ -89,6 +89,7 @@
   I_mipsisa64,
   I_mipsisa64r2,
@@ -130,9 +130,30 @@ diff -Nbaur binutils-2.22/bfd/cpu-mips.c binutils-2.22-psp/bfd/cpu-mips.c
   N (64, 64, bfd_mach_mips_loongson_2e, "mips:loongson_2e",       FALSE, NN(I_loongson_2e)),
   N (64, 64, bfd_mach_mips_loongson_2f, "mips:loongson_2f",       FALSE, NN(I_loongson_2f)),
   N (64, 64, bfd_mach_mips_loongson_3a, "mips:loongson_3a",       FALSE, NN(I_loongson_3a)),
+diff -Nbaur binutils-2.22/bfd/doc/bfd.texinfo binutils-2.22-psp/bfd/doc/bfd.texinfo
+--- binutils-2.22/bfd/doc/bfd.texinfo	2010-10-28 11:40:25.000000000 +0000
+++ binutils-2.22-psp/bfd/doc/bfd.texinfo	2018-06-05 23:00:58.016586742 +0000
+@@ -322,7 +322,7 @@
+ @printindex cp
+ 
+ @tex
+-% I think something like @colophon should be in texinfo.  In the
+% I think something like @@colophon should be in texinfo.  In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -333,7 +333,7 @@
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
+% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+ 
+ @bye
 diff -Nbaur binutils-2.22/bfd/elfxx-mips.c binutils-2.22-psp/bfd/elfxx-mips.c
 --- binutils-2.22/bfd/elfxx-mips.c	2011-11-21 09:29:27.000000000 +0000
-+++ binutils-2.22-psp/bfd/elfxx-mips.c	2012-04-03 22:08:06.000000000 +0100
+++ binutils-2.22-psp/bfd/elfxx-mips.c	2018-06-05 22:45:23.853892502 +0000
@@ -6173,14 +6173,19 @@
     case E_MIPS_MACH_SB1:
       return bfd_mach_mips_sb1;
@@ -173,8 +194,8 @@ diff -Nbaur binutils-2.22/bfd/elfxx-mips.c binutils-2.22-psp/bfd/elfxx-mips.c
   /* MIPS I extensions.  */
   { bfd_mach_mips6000, bfd_mach_mips3000 },
 diff -Nbaur binutils-2.22/bfd/plugin.c binutils-2.22-psp/bfd/plugin.c
--- binutils-2.22/bfd/plugin.c	2011-07-11 16:03:07.000000000 +0100
-+++ binutils-2.22-psp/bfd/plugin.c	2012-04-03 22:12:53.000000000 +0100
+--- binutils-2.22/bfd/plugin.c	2011-07-11 15:03:07.000000000 +0000
+++ binutils-2.22-psp/bfd/plugin.c	2018-06-05 22:45:23.853892502 +0000
@@ -25,7 +25,13 @@
 #if BFD_SUPPORTS_PLUGINS
 
@@ -229,7 +250,7 @@ diff -Nbaur binutils-2.22/bfd/plugin.c binutils-2.22-psp/bfd/plugin.c
 #define bfd_plugin_new_section_hook                   _bfd_generic_new_section_hook
 diff -Nbaur binutils-2.22/bfd/version.h binutils-2.22-psp/bfd/version.h
 --- binutils-2.22/bfd/version.h	2011-11-21 09:29:28.000000000 +0000
-+++ binutils-2.22-psp/bfd/version.h	2012-04-03 22:08:06.000000000 +0100
+++ binutils-2.22-psp/bfd/version.h	2018-06-05 22:45:23.857893494 +0000
@@ -1,4 +1,4 @@
 -#define BFD_VERSION_DATE 20111121
 +#define BFD_VERSION_DATE (PSNPT 20120103)
@@ -237,8 +258,8 @@ diff -Nbaur binutils-2.22/bfd/version.h binutils-2.22-psp/bfd/version.h
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@
 diff -Nbaur binutils-2.22/binutils/readelf.c binutils-2.22-psp/binutils/readelf.c
--- binutils-2.22/binutils/readelf.c	2011-09-21 21:49:13.000000000 +0100
-+++ binutils-2.22-psp/binutils/readelf.c	2012-04-03 22:08:06.000000000 +0100
+--- binutils-2.22/binutils/readelf.c	2011-09-21 20:49:13.000000000 +0000
+++ binutils-2.22-psp/binutils/readelf.c	2018-06-05 22:45:23.857893494 +0000
@@ -2395,10 +2395,11 @@
 	    case E_MIPS_MACH_9000: strcat (buf, ", 9000"); break;
   	    case E_MIPS_MACH_LS2E: strcat (buf, ", loongson-2e"); break;
@@ -253,8 +274,8 @@ diff -Nbaur binutils-2.22/binutils/readelf.c binutils-2.22-psp/binutils/readelf.
 	    /* We simply ignore the field in this case to avoid confusion:
 	       MIPS ELF does not specify EF_MIPS_MACH, it is a GNU
 diff -Nbaur binutils-2.22/config.sub binutils-2.22-psp/config.sub
--- binutils-2.22/config.sub	2011-06-06 11:36:06.000000000 +0100
-+++ binutils-2.22-psp/config.sub	2012-04-03 22:08:06.000000000 +0100
+--- binutils-2.22/config.sub	2011-06-06 10:36:06.000000000 +0000
+++ binutils-2.22-psp/config.sub	2018-06-05 22:45:23.857893494 +0000
@@ -279,6 +279,7 @@
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
@@ -283,8 +304,8 @@ diff -Nbaur binutils-2.22/config.sub binutils-2.22-psp/config.sub
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
 diff -Nbaur binutils-2.22/configure binutils-2.22-psp/configure
--- binutils-2.22/configure	2011-08-14 13:28:15.000000000 +0100
-+++ binutils-2.22-psp/configure	2012-04-03 22:08:06.000000000 +0100
+--- binutils-2.22/configure	2011-08-14 12:28:15.000000000 +0000
+++ binutils-2.22-psp/configure	2018-06-05 22:45:23.861894485 +0000
@@ -2667,7 +2667,7 @@
 # binutils, gas and ld appear in that order because it makes sense to run
 # "make check" in that particular order.
@@ -304,7 +325,7 @@ diff -Nbaur binutils-2.22/configure binutils-2.22-psp/configure
     case "${target}" in
 diff -Nbaur binutils-2.22/gas/config/tc-mips.c binutils-2.22-psp/gas/config/tc-mips.c
 --- binutils-2.22/gas/config/tc-mips.c	2011-11-21 09:29:32.000000000 +0000
-+++ binutils-2.22-psp/gas/config/tc-mips.c	2012-04-03 22:08:06.000000000 +0100
+++ binutils-2.22-psp/gas/config/tc-mips.c	2018-06-05 22:45:23.865895476 +0000
@@ -91,8 +91,32 @@
 
 #define ZERO 0
@@ -2171,8 +2192,8 @@ diff -Nbaur binutils-2.22/gas/config/tc-mips.c binutils-2.22-psp/gas/config/tc-m
   /* MIPS III */
   { "r4000",          0,			ISA_MIPS3,      CPU_R4000 },
 diff -Nbaur binutils-2.22/gas/configure binutils-2.22-psp/gas/configure
--- binutils-2.22/gas/configure	2011-05-18 10:41:14.000000000 +0100
-+++ binutils-2.22-psp/gas/configure	2012-04-03 22:08:06.000000000 +0100
+--- binutils-2.22/gas/configure	2011-05-18 09:41:14.000000000 +0000
+++ binutils-2.22-psp/gas/configure	2018-06-05 22:45:23.865895476 +0000
@@ -12043,6 +12043,9 @@
 	  mips64vr | mips64vrel)
 	    mips_cpu=vr4100
@@ -2184,8 +2205,8 @@ diff -Nbaur binutils-2.22/gas/configure binutils-2.22-psp/gas/configure
 	    mips_cpu=`echo $target_cpu | sed -e 's/[a-z]*..r2//' -e 's/el$//'`
 	    ;;
 diff -Nbaur binutils-2.22/gas/configure.in binutils-2.22-psp/gas/configure.in
--- binutils-2.22/gas/configure.in	2011-05-18 10:41:14.000000000 +0100
-+++ binutils-2.22-psp/gas/configure.in	2012-04-03 22:08:06.000000000 +0100
+--- binutils-2.22/gas/configure.in	2011-05-18 09:41:14.000000000 +0000
+++ binutils-2.22-psp/gas/configure.in	2018-06-05 22:45:23.869896468 +0000
@@ -213,6 +213,9 @@
 	  mips64vr | mips64vrel)
 	    mips_cpu=vr4100
@@ -2198,7 +2219,7 @@ diff -Nbaur binutils-2.22/gas/configure.in binutils-2.22-psp/gas/configure.in
 	    mips_cpu=`echo $target_cpu | sed -e 's/[a-z]*..r2//' -e 's/el$//'`
 diff -Nbaur binutils-2.22/gas/testsuite/gas/mips/mips.exp binutils-2.22-psp/gas/testsuite/gas/mips/mips.exp
 --- binutils-2.22/gas/testsuite/gas/mips/mips.exp	2011-11-21 09:29:32.000000000 +0000
-+++ binutils-2.22-psp/gas/testsuite/gas/mips/mips.exp	2012-04-03 22:08:06.000000000 +0100
+++ binutils-2.22-psp/gas/testsuite/gas/mips/mips.exp	2018-06-05 22:45:23.869896468 +0000
@@ -409,6 +409,9 @@
 mips_arch_create sb1 	64	mips64	{ mips3d } \
 			{ -march=sb1 -mtune=sb1 } { -mmips:sb1 } \
@@ -2210,8 +2231,8 @@ diff -Nbaur binutils-2.22/gas/testsuite/gas/mips/mips.exp binutils-2.22-psp/gas/
 			{ -march=octeon -mtune=octeon } { -mmips:octeon } \
 			{ mips64octeon*-*-* }
 diff -Nbaur binutils-2.22/include/elf/common.h binutils-2.22-psp/include/elf/common.h
--- binutils-2.22/include/elf/common.h	2011-07-22 21:22:36.000000000 +0100
-+++ binutils-2.22-psp/include/elf/common.h	2012-04-03 22:08:06.000000000 +0100
+--- binutils-2.22/include/elf/common.h	2011-07-22 20:22:36.000000000 +0000
+++ binutils-2.22-psp/include/elf/common.h	2018-06-05 22:45:23.869896468 +0000
@@ -96,6 +96,7 @@
 #define ET_HIOS		0xFEFF	/* Operating system-specific */
 #define ET_LOPROC	0xFF00	/* Processor-specific */
@@ -2221,8 +2242,8 @@ diff -Nbaur binutils-2.22/include/elf/common.h binutils-2.22-psp/include/elf/com
 /* Values for e_machine, which identifies the architecture.  These numbers
    are officially assigned by registry@sco.com.  See below for a list of
 diff -Nbaur binutils-2.22/include/elf/mips.h binutils-2.22-psp/include/elf/mips.h
--- binutils-2.22/include/elf/mips.h	2011-07-24 15:20:12.000000000 +0100
-+++ binutils-2.22-psp/include/elf/mips.h	2012-04-03 22:08:07.000000000 +0100
+--- binutils-2.22/include/elf/mips.h	2011-07-24 14:20:12.000000000 +0000
+++ binutils-2.22-psp/include/elf/mips.h	2018-06-05 22:45:23.869896468 +0000
@@ -265,6 +265,7 @@
 #define E_MIPS_MACH_5400	0x00910000
 #define E_MIPS_MACH_5500	0x00980000
@@ -2232,8 +2253,8 @@ diff -Nbaur binutils-2.22/include/elf/mips.h binutils-2.22-psp/include/elf/mips.
 #define E_MIPS_MACH_LS2F        0x00A10000
 #define E_MIPS_MACH_LS3A        0x00A20000
 diff -Nbaur binutils-2.22/include/opcode/mips.h binutils-2.22-psp/include/opcode/mips.h
--- binutils-2.22/include/opcode/mips.h	2011-08-09 16:20:03.000000000 +0100
-+++ binutils-2.22-psp/include/opcode/mips.h	2012-04-03 22:08:07.000000000 +0100
+--- binutils-2.22/include/opcode/mips.h	2011-08-09 15:20:03.000000000 +0000
+++ binutils-2.22-psp/include/opcode/mips.h	2018-06-05 22:45:23.869896468 +0000
@@ -216,6 +216,228 @@
 #define MDMX_FMTSEL_VEC_QH	0x15
 #define MDMX_FMTSEL_VEC_OB	0x16
@@ -2591,8 +2612,8 @@ diff -Nbaur binutils-2.22/include/opcode/mips.h binutils-2.22-psp/include/opcode
   M_COP0,
   M_COP1,
 diff -Nbaur binutils-2.22/include/opcode/vfpu.h binutils-2.22-psp/include/opcode/vfpu.h
--- binutils-2.22/include/opcode/vfpu.h	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.22-psp/include/opcode/vfpu.h	2012-04-03 22:08:07.000000000 +0100
+--- binutils-2.22/include/opcode/vfpu.h	1970-01-01 00:00:00.000000000 +0000
+++ binutils-2.22-psp/include/opcode/vfpu.h	2018-06-05 22:45:23.869896468 +0000
@@ -0,0 +1,261 @@
 +#ifndef _VFPU_H_
 +#define _VFPU_H_
@@ -2857,7 +2878,7 @@ diff -Nbaur binutils-2.22/include/opcode/vfpu.h binutils-2.22-psp/include/opcode
 +#endif /* _VFPU_H_ */
 diff -Nbaur binutils-2.22/ld/configure.tgt binutils-2.22-psp/ld/configure.tgt
 --- binutils-2.22/ld/configure.tgt	2011-11-21 09:29:37.000000000 +0000
-+++ binutils-2.22-psp/ld/configure.tgt	2012-04-03 22:08:07.000000000 +0100
+++ binutils-2.22-psp/ld/configure.tgt	2018-06-05 22:45:23.869896468 +0000
@@ -383,6 +383,8 @@
 mips*vr4100-*-elf*)	targ_emul=elf32b4300 ;;
 mips*vr5000el-*-elf*)	targ_emul=elf32l4300 ;;
@@ -2868,8 +2889,8 @@ diff -Nbaur binutils-2.22/ld/configure.tgt binutils-2.22-psp/ld/configure.tgt
 			targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" ;;
 mips*-sde-elf*)		targ_emul=elf32btsmip
 diff -Nbaur binutils-2.22/ld/emulparams/elf_mipsallegrexel_psp.sh binutils-2.22-psp/ld/emulparams/elf_mipsallegrexel_psp.sh
--- binutils-2.22/ld/emulparams/elf_mipsallegrexel_psp.sh	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.22-psp/ld/emulparams/elf_mipsallegrexel_psp.sh	2012-04-03 22:08:07.000000000 +0100
+--- binutils-2.22/ld/emulparams/elf_mipsallegrexel_psp.sh	1970-01-01 00:00:00.000000000 +0000
+++ binutils-2.22-psp/ld/emulparams/elf_mipsallegrexel_psp.sh	2018-06-05 22:45:23.869896468 +0000
@@ -0,0 +1,22 @@
 +# Based off of the default elf32 MIPS target.  However, we use a seperate
 +# script template because the PSP architecture defines sections that normally
@@ -2894,8 +2915,8 @@ diff -Nbaur binutils-2.22/ld/emulparams/elf_mipsallegrexel_psp.sh binutils-2.22-
 +# Discard the .comment and .pdr sections.
 +OTHER_SECTIONS="/DISCARD/ : { *(.comment) *(.pdr) }"
 diff -Nbaur binutils-2.22/ld/Makefile.am binutils-2.22-psp/ld/Makefile.am
--- binutils-2.22/ld/Makefile.am	2011-07-22 21:22:37.000000000 +0100
-+++ binutils-2.22-psp/ld/Makefile.am	2012-04-03 22:08:07.000000000 +0100
+--- binutils-2.22/ld/Makefile.am	2011-07-22 20:22:37.000000000 +0000
+++ binutils-2.22-psp/ld/Makefile.am	2018-06-05 22:45:23.869896468 +0000
@@ -262,6 +262,7 @@
 	eelf_i386_ldso.c \
 	eelf_i386_sol2.c \
@@ -2915,8 +2936,8 @@ diff -Nbaur binutils-2.22/ld/Makefile.am binutils-2.22-psp/ld/Makefile.am
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf_s390 "$(tdir_elf_s390)"
 diff -Nbaur binutils-2.22/ld/Makefile.in binutils-2.22-psp/ld/Makefile.in
--- binutils-2.22/ld/Makefile.in	2011-07-22 21:22:37.000000000 +0100
-+++ binutils-2.22-psp/ld/Makefile.in	2012-04-03 22:08:07.000000000 +0100
+--- binutils-2.22/ld/Makefile.in	2011-07-22 20:22:37.000000000 +0000
+++ binutils-2.22-psp/ld/Makefile.in	2018-06-05 22:45:23.873897459 +0000
@@ -568,6 +568,7 @@
 	eelf_i386_ldso.c \
 	eelf_i386_sol2.c \
@@ -2936,8 +2957,8 @@ diff -Nbaur binutils-2.22/ld/Makefile.in binutils-2.22-psp/ld/Makefile.in
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf_s390 "$(tdir_elf_s390)"
 diff -Nbaur binutils-2.22/ld/scripttempl/elf_psp.sc binutils-2.22-psp/ld/scripttempl/elf_psp.sc
--- binutils-2.22/ld/scripttempl/elf_psp.sc	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.22-psp/ld/scripttempl/elf_psp.sc	2012-04-03 22:08:07.000000000 +0100
+--- binutils-2.22/ld/scripttempl/elf_psp.sc	1970-01-01 00:00:00.000000000 +0000
+++ binutils-2.22-psp/ld/scripttempl/elf_psp.sc	2018-06-05 22:45:23.873897459 +0000
@@ -0,0 +1,496 @@
 +#
 +# Unusual variables checked by this code:
@@ -3436,8 +3457,8 @@ diff -Nbaur binutils-2.22/ld/scripttempl/elf_psp.sc binutils-2.22-psp/ld/scriptt
 +}
 +EOF
 diff -Nbaur binutils-2.22/opcodes/mips-dis.c binutils-2.22-psp/opcodes/mips-dis.c
--- binutils-2.22/opcodes/mips-dis.c	2011-08-09 16:20:03.000000000 +0100
-+++ binutils-2.22-psp/opcodes/mips-dis.c	2012-04-03 22:08:07.000000000 +0100
+--- binutils-2.22/opcodes/mips-dis.c	2011-08-09 15:20:03.000000000 +0000
+++ binutils-2.22-psp/opcodes/mips-dis.c	2018-06-05 22:45:23.873897459 +0000
@@ -245,6 +245,139 @@
   "c0_taglo",     "c0_taghi",     "c0_errorepc",  "c0_desave",
 };
@@ -3993,8 +4014,8 @@ diff -Nbaur binutils-2.22/opcodes/mips-dis.c binutils-2.22-psp/opcodes/mips-dis.
 	  /* xgettext:c-format */
 	  (*info->fprintf_func) (info->stream,
 diff -Nbaur binutils-2.22/opcodes/mips-opc.c binutils-2.22-psp/opcodes/mips-opc.c
--- binutils-2.22/opcodes/mips-opc.c	2011-08-09 16:20:03.000000000 +0100
-+++ binutils-2.22-psp/opcodes/mips-opc.c	2012-04-03 22:08:07.000000000 +0100
+--- binutils-2.22/opcodes/mips-opc.c	2011-08-09 15:20:03.000000000 +0000
+++ binutils-2.22-psp/opcodes/mips-opc.c	2018-06-05 22:45:23.873897459 +0000
@@ -121,6 +121,7 @@
 #define N5	(INSN_5400 | INSN_5500)
 #define N54	INSN_5400
--- a/dkpsp/scripts/build-gcc.sh
+++ b/dkpsp/scripts/build-gcc.sh
@@ -56,6 +56,8 @@ then
 	--disable-dependency-tracking \
 	--with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitPSP release 17" \
 	$CROSS_PARAMS \
+	MAKEINFO=missing \
+	MISSING=texinfo \
 	|| { echo "Error configuring gcc"; exit 1; }
 	touch configured-gcc
 fi
@@ -174,28 +176,30 @@ cd $BUILDDIR
 #---------------------------------------------------------------------------------
 # build and install the debugger
 #---------------------------------------------------------------------------------
-mkdir -p $target/gdb
-cd $target/gdb
-
-if [ ! -f configured-gdb ]
-then
-	CFLAGS=$cflags LDFLAGS=$ldflags ../../gdb-$GDB_VER/configure \
-	--disable-nls --prefix=$prefix --target=$target --disable-werror \
-	--disable-dependency-tracking \
-	$CROSS_PARAMS \
-	|| { echo "Error configuring gdb"; exit 1; }
-	touch configured-gdb
-fi
-
-if [ ! -f built-gdb ]
-then
-	$MAKE || { echo "Error building gdb"; exit 1; }
-	touch built-gdb
-fi
-
-if [ ! -f installed-gdb ]
-then
-	$MAKE install || { echo "Error installing gdb"; exit 1; }
-	touch installed-gdb
-fi
+#mkdir -p $target/gdb
+#cd $target/gdb
+#
+#if [ ! -f configured-gdb ]
+#then
+#	CFLAGS=$cflags LDFLAGS=$ldflags ../../gdb-$GDB_VER/configure \
+#	--disable-nls --prefix=$prefix --target=$target --disable-werror \
+#	--disable-dependency-tracking \
+#	$CROSS_PARAMS \
+#	MAKEINFO=missing \
+#	MISSING=texinfo \
+#	|| { echo "Error configuring gdb"; exit 1; }
+#	touch configured-gdb
+#fi
+#
+#if [ ! -f built-gdb ]
+#then
+#	$MAKE || { echo "Error building gdb"; exit 1; }
+#	touch built-gdb
+#fi
+#
+#if [ ! -f installed-gdb ]
+#then
+#	$MAKE install || { echo "Error installing gdb"; exit 1; }
+#	touch installed-gdb
+#fi

--- a/select_toolchain.sh
+++ b/select_toolchain.sh
@@ -18,13 +18,13 @@ done

 case "$VERSION" in
  "1" )
-    GCC_VER=4.7.1
+    GCC_VER=4.7.0
    BINUTILS_VER=2.22
    NEWLIB_VER=1.20.0
-    GDB_VER=7.4.1
+    GDB_VER=7.4
    basedir='dkarm-eabi'
    package=devkitARM
-    target=arm-none-eabi
+    target=arm-eabi
    toolchain=DEVKITARM
  ;;
  "2" )
--- a/strip_bins.sh
+++ b/strip_bins.sh
@@ -19,10 +19,6 @@ do
 	then
 		$HOST_STRIP $f
 	fi
-	if [[ "$f" == *.dll ]]
-	then
-		$HOST_STRIP -d $f
-	fi
 done

 if [ $VERSION -eq 2 ]; then