Update to version 2.38

3 files changed, 10 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3370d7d211f6..17608e7ca275 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mips64-linux-gnu-binutils
 	pkgdesc = Tools to assemble and manipulate binary and object files for the MIPS64 target (for the toolchain with GNU C library and multilib ABI)
-	pkgver = 2.37
+	pkgver = 2.38
 	pkgrel = 1
 	url = https://www.gnu.org/software/binutils/
 	arch = x86_64
@@ -11,14 +11,12 @@ pkgbase = mips64-linux-gnu-binutils
 	options = staticlibs
 	options = !distcc
 	options = !ccache
-	source = https://ftp.gnu.org/gnu/binutils/binutils-2.37.tar.xz
-	source = https://ftp.gnu.org/gnu/binutils/binutils-2.37.tar.xz.sig
-	source = 010-binutils-mips64-default-to-64-emulation-gf26867f.patch::https://raw.githubusercontent.com/openembedded/openembedded-core/f26867fe4daec7299f59a82ae4a0d70cceb3e082/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
-	source = 020-binutils-build-fix.patch
+	source = https://ftp.gnu.org/gnu/binutils/binutils-2.38.tar.xz
+	source = https://ftp.gnu.org/gnu/binutils/binutils-2.38.tar.xz.sig
+	source = 010-binutils-mips64-default-to-64-emulation-g3dea562.patch::https://raw.githubusercontent.com/openembedded/openembedded-core/3dea562e9d615384cc5e786eff46ac1f8f41e18e/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch
 	validpgpkeys = 3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F
-	sha256sums = 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c
+	sha256sums = e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024
 	sha256sums = SKIP
 	sha256sums = 2e0c71612d770d3b9531fa66211ac7ef810ddbe6253efe440ec1a069b08926b9
-	sha256sums = 510296287d6e59b879e139e0b671ccc4d1ce5254b259a09dae4a20bacfe9cf63
 
 pkgname = mips64-linux-gnu-binutils
diff --git a/020-binutils-build-fix.patch b/020-binutils-build-fix.patch
deleted file mode 100644
index 27e83fa11c8e..000000000000
--- a/020-binutils-build-fix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/libiberty/configure
-+++ b/libiberty/configure
-@@ -2452,7 +2452,7 @@ fi
- ## -------------------- ##
- 
- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
-+ac_cpp='$CPP $CPPFLAGS -O2'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-@@ -3121,7 +3121,7 @@ $as_echo "$as_me: target_header_dir = $t
- 
- 
- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
-+ac_cpp='$CPP $CPPFLAGS -O2'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-@@ -3933,14 +3933,14 @@ if test "x$ac_cv_prog_cc_c89" != xno; th
- fi
- 
- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
-+ac_cpp='$CPP $CPPFLAGS -O2'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
-+ac_cpp='$CPP $CPPFLAGS -O2'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-@@ -4071,7 +4071,7 @@ See \`config.log' for more details" "$LI
- fi
- 
- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
-+ac_cpp='$CPP $CPPFLAGS -O2'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-@@ -4602,7 +4602,7 @@ fi
- ac_c_preproc_warn_flag=yes
- 
- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
-+ac_cpp='$CPP $CPPFLAGS -O2'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-@@ -4654,14 +4654,14 @@ fi
-   done
- CFLAGS="$save_CFLAGS"
- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
-+ac_cpp='$CPP $CPPFLAGS -O2'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
-+ac_cpp='$CPP $CPPFLAGS -O2'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-@@ -4703,7 +4703,7 @@ fi
- 
- fi
- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
-+ac_cpp='$CPP $CPPFLAGS -O2'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
diff --git a/PKGBUILD b/PKGBUILD
index 2f847ab1f4e3..65dfd83147b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _target=mips64-linux-gnu
 pkgname="${_target}-binutils"
-pkgver=2.37
+pkgver=2.38
 pkgrel=1
 pkgdesc='Tools to assemble and manipulate binary and object files for the MIPS64 target (for the toolchain with GNU C library and multilib ABI)'
 arch=('x86_64')
@@ -11,20 +11,17 @@ url='https://www.gnu.org/software/binutils/'
 license=('GPL')
 depends=('libelf' 'zlib')
 options=('!emptydirs' 'staticlibs' '!distcc' '!ccache')
-_patchver='f26867fe4daec7299f59a82ae4a0d70cceb3e082'
+_patchver='3dea562e9d615384cc5e786eff46ac1f8f41e18e'
 source=("https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.xz"{,.sig}
-        "010-binutils-mips64-default-to-64-emulation-g${_patchver:0:7}.patch"::"https://raw.githubusercontent.com/openembedded/openembedded-core/${_patchver}/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch"
-        '020-binutils-build-fix.patch')
-sha256sums=('820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c'
+        "010-binutils-mips64-default-to-64-emulation-g${_patchver:0:7}.patch"::"https://raw.githubusercontent.com/openembedded/openembedded-core/${_patchver}/meta/recipes-devtools/binutils/binutils/0009-Change-default-emulation-for-mips64-linux.patch")
+sha256sums=('e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024'
             'SKIP'
-            '2e0c71612d770d3b9531fa66211ac7ef810ddbe6253efe440ec1a069b08926b9'
-            '510296287d6e59b879e139e0b671ccc4d1ce5254b259a09dae4a20bacfe9cf63')
+            '2e0c71612d770d3b9531fa66211ac7ef810ddbe6253efe440ec1a069b08926b9')
 validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton
 
 prepare() {
     mkdir -p build
     patch -d "binutils-${pkgver}" -Np1 -i "${srcdir}/010-binutils-mips64-default-to-64-emulation-g${_patchver:0:7}.patch"
-    patch -d "binutils-${pkgver}" -Np1 -i "${srcdir}/020-binutils-build-fix.patch"
 }
 
 build() {