Upgrade to 2.30.

5 files changed, 11 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90980e44ef80..cdf9f7cb10f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = m68k-atari-mint-binutils
 	pkgdesc = A set of programs to assemble and manipulate binary and object files for the M68K architecture
-	pkgver = 2.23.2
-	pkgrel = 7
+	pkgver = 2.30
+	pkgrel = 1
 	url = http://www.gnu.org/software/binutils/
 	arch = i686
 	arch = x86_64
@@ -9,12 +9,10 @@ pkgbase = m68k-atari-mint-binutils
 	depends = glibc
 	conflicts = cross-m68k-atari-mint-binutils
 	replaces = cross-m68k-atari-mint-binutils
-	source = ftp://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2
-	source = binutils-2.23.2-mint-20130327.patch.bz2
-	source = tc-m68k.c.patch
-	sha1sums = 042c51073205ebaf88c272d6168f9deb71984b56
-	sha1sums = d6c21353905e24e3f3f410e4251866dc3ed6af8c
-	sha1sums = c76e49cf19ece5bf01d9d67274950f078ce30fe2
+	source = ftp://ftp.gnu.org/gnu/binutils/binutils-2.30.tar.bz2
+	source = binutils-2.30-mint-20180703.patch.bz2
+	sha1sums = 33d807f7fa680b00439eb5560acd0c2ef645e5f9
+	sha1sums = bbf149ff3e6d8b15a217b71ad79fdb020a804e01
 
 pkgname = m68k-atari-mint-binutils
 
diff --git a/PKGBUILD b/PKGBUILD
index 8ce65e83b424..3ecd147438e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 pkgname=m68k-atari-mint-binutils
 _pkgname=binutils
 _target="m68k-atari-mint"
-pkgver=2.23.2
-pkgrel=7
+pkgver=2.30
+pkgrel=1
 pkgdesc="A set of programs to assemble and manipulate binary and object files for the M68K architecture"
 url="http://www.gnu.org/software/binutils/"
 arch=('i686' 'x86_64')
@@ -13,22 +13,20 @@ license=('GPL')
 depends=('glibc')
 replaces=('cross-m68k-atari-mint-binutils')
 conflicts=('cross-m68k-atari-mint-binutils')
-source=("ftp://ftp.gnu.org/gnu/binutils/${_pkgname}-${pkgver}.tar.bz2" "binutils-2.23.2-mint-20130327.patch.bz2" "tc-m68k.c.patch")
-sha1sums=('042c51073205ebaf88c272d6168f9deb71984b56' 'd6c21353905e24e3f3f410e4251866dc3ed6af8c' 'c76e49cf19ece5bf01d9d67274950f078ce30fe2')
+source=("ftp://ftp.gnu.org/gnu/binutils/${_pkgname}-${pkgver}.tar.bz2" "binutils-2.30-mint-20180703.patch.bz2")
+sha1sums=('33d807f7fa680b00439eb5560acd0c2ef645e5f9' 'bbf149ff3e6d8b15a217b71ad79fdb020a804e01')
 _sysroot="/usr/lib/${_target}"
 
 prepare() {
 	cd ${srcdir}/${_pkgname}-${pkgver}
 
-        patch -Np1 < ../binutils-2.23.2-mint-20130327.patch
-        patch -p0 < ../tc-m68k.c.patch
+        patch -Np1 < ../binutils-2.30-mint-20180703.patch
 }
 
 build() {
 	cd ${srcdir}/${_pkgname}-${pkgver}
 
         CFLAGS=${CFLAGS//-D_FORTIFY_SOURCE=?/}
-        CFLAGS="${CFLAGS} -Wno-unused-value -Wno-shift-negative-value -Wno-error=implicit-fallthrough -Wno-error=format-overflow -Wno-error=cast-function-type -Wno-error=stringop-truncation -Wno-error=pointer-compare"
         export CFLAGS
         
         CPPFLAGS=${CPPFLAGS//-D_FORTIFY_SOURCE=?/}
diff --git a/binutils-2.23.2-mint-20130327.patch.bz2 b/binutils-2.23.2-mint-20130327.patch.bz2
deleted file mode 100644
index 64d2ca415828..000000000000
--- a/binutils-2.23.2-mint-20130327.patch.bz2
+++ /dev/null
diff --git a/binutils-2.30-mint-20180703.patch.bz2 b/binutils-2.30-mint-20180703.patch.bz2
new file mode 100644
index 000000000000..69af538a4488
--- /dev/null
+++ b/binutils-2.30-mint-20180703.patch.bz2
diff --git a/tc-m68k.c.patch b/tc-m68k.c.patch
deleted file mode 100644
index e51b6f3a3bac..000000000000
--- a/tc-m68k.c.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gas/config/tc-m68k.c	2012-05-16 12:26:47.000000000 +0200
-+++ gas/config/tc-m68k.c	2013-11-24 12:36:00.639003638 +0100
-@@ -4782,6 +4782,26 @@
-   record_alignment (data_section, 2);
-   record_alignment (bss_section, 2);
- #endif
-+
-+  {
-+    unsigned int cpu = bfd_mach_m68020;
-+    if(selected_cpu) {
-+      switch(selected_cpu->arch) {
-+      case m68000:
-+        cpu = bfd_mach_m68000;
-+        break;
-+      case m68010:
-+        cpu = bfd_mach_m68010;
-+        break;
-+      default:
-+        cpu = bfd_mach_m68020;
-+        break;
-+      }
-+    }
-+
-+    if (! bfd_set_arch_mach (stdoutput, bfd_arch_m68k, cpu))
-+      as_warn (_("could not set architecture and machine"));
-+  }
- }
- 
-