From df5a8f947a9a151c059e544fa8c6e67748efe68e Mon Sep 17 00:00:00 2001
From: Dave Murphy <davem@devkitpro.org>
Date: Tue, 3 Jul 2018 09:37:08 +0100
Subject: [PATCH] updates for devkitPPC r32

---
 build-devkit.sh                  | 4 ++--
 dkppc/patches/newlib-3.0.0.patch | 7 +++----
 dkppc/scripts/build-gcc.sh       | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build-devkit.sh b/build-devkit.sh
index 4c01090..ecb1007 100755
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 #---------------------------------------------------------------------------------
 #	devkitARM release 49
-#	devkitPPC release 31
+#	devkitPPC release 32
 #	devkitA64 release 10
 #---------------------------------------------------------------------------------
 
-if [ 1 -eq 1 ] ; then
+if [ 0 -eq 1 ] ; then
 	echo "Please use the latest release buildscripts unless advised otherwise by devkitPro staff."
 	echo "https://github.com/devkitPro/buildscripts/releases/latest"
 	echo
diff --git a/dkppc/patches/newlib-3.0.0.patch b/dkppc/patches/newlib-3.0.0.patch
index 0e11ad0..c3ae6c8 100644
--- a/dkppc/patches/newlib-3.0.0.patch
+++ b/dkppc/patches/newlib-3.0.0.patch
@@ -7407,17 +7407,16 @@ index eb645868b..b9a006453 100644
    powerpc*-*-linux* | \
    powerpc*-*-rtem* | \
 diff --git a/newlib/libc/include/sys/dirent.h b/newlib/libc/include/sys/dirent.h
-index a3fb5c02c..8ddd10867 100644
+index a3fb5c02c..b42f0b3b1 100644
 --- a/newlib/libc/include/sys/dirent.h
 +++ b/newlib/libc/include/sys/dirent.h
-@@ -4,10 +4,57 @@
+@@ -4,10 +4,56 @@
     not support <dirent.h>, we will get this file which uses #error to force
     an error.  */
  
 +#ifndef _dirent_h_
 +#define _dirent_h_
 +
-+#include <sys/iosupport.h>
 +#include <sys/types.h>
 +#include <sys/syslimits.h>
 +
@@ -7446,7 +7445,7 @@ index a3fb5c02c..8ddd10867 100644
 +
 +	typedef struct {
 +		long int        position;
-+		DIR_ITER*       dirData;
++		void*           dirData;
 +		struct dirent   fileData;
 +	} DIR;
 +
diff --git a/dkppc/scripts/build-gcc.sh b/dkppc/scripts/build-gcc.sh
index d99dd18..e1a9589 100755
--- a/dkppc/scripts/build-gcc.sh
+++ b/dkppc/scripts/build-gcc.sh
@@ -97,7 +97,7 @@ then
 	--with-headers=../../newlib-$NEWLIB_VER/newlib/libc/include \
 	--prefix=$prefix\
 	--with-system-zlib\
-	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 31" \
+	--with-bugurl="https://github.com/devkitpro/buildscripts/issues" --with-pkgversion="devkitPPC release 32" \
 	$CROSS_PARAMS \
 	$CROSS_GCC_PARAMS \
         CFLAGS_FOR_TARGET="-O2 -ffunction-sections -fdata-sections" \
@@ -139,7 +139,6 @@ then
 	--target=$target \
 	--prefix=$prefix \
 	--enable-newlib-mb \
-	--enable-newlib-hw-fp \
 	|| { echo "Error configuring newlib"; exit 1; }
 	touch configured-newlib
 fi
@@ -203,7 +202,8 @@ if [ ! -f configured-gdb ]
 then
 	CFLAGS="$cflags" LDFLAGS="$ldflags" ../../gdb-$GDB_VER/configure \
 	--disable-nls --prefix=$prefix --target=$target --disable-werror \
-	$CROSS_PARAMS || { echo "Error configuring gdb"; exit 1; }
+	$CROSS_PARAMS \
+	$CROSS_GCC_PARAMS || { echo "Error configuring gdb"; exit 1; }
 	touch configured-gdb
 fi