add open-ath9k-htc-firmware patch on gcc and binutils

3 files changed, 14 insertions, 124 deletions

diff --git a/cross/cross-binutils/PKGBUILD b/cross/cross-binutils/PKGBUILD
index 9eef49ede..5d2bd338d 100644
--- a/cross/cross-binutils/PKGBUILD
+++ b/cross/cross-binutils/PKGBUILD
@@ -125,7 +125,7 @@ fi
 _pkgname=binutils
 pkgname=$_target-$_pkgname
 pkgver=2.24
-pkgrel=7.1
+pkgrel=7.2
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/$_pkgname/"
@@ -137,14 +137,16 @@ provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
 install=$_pkgname.install
 source=(ftp://ftp.gnu.org/gnu/$_pkgname/$_pkgname-${pkgver}.tar.bz2{,.sig}
-        binutils-2.24-lto-testsuite.patch
-        binutils-2.24-gold-testsuite-plugin.patch
-        binutils-2.24-shared-pie.patch)
+        $_pkgname-2.24-lto-testsuite.patch
+        $_pkgname-2.24-gold-testsuite-plugin.patch
+        $_pkgname-2.24-shared-pie.patch
+        $_pkgname-xtensa.patch::https://raw.githubusercontent.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/$_pkgname.patch)
 md5sums=('e0f71a7b2ddab0f8612336ac81d9636b'
          'SKIP'
          'e68a1f221545f082baa5bd417cd077af'
          'e46bbb03abaa5db58c12247644dc4857'
-         'ec59461c4febab9cfe1c1ef33326bc50')
+         'ec59461c4febab9cfe1c1ef33326bc50'
+         '7077126d96e9a755a0eaddb5505efe68')
 validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93')
 
 prepare() {
@@ -154,13 +156,16 @@ prepare() {
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 
   # fix lto testsuite with gcc-4.9 - commits b35d44f1 and 37a6ac44
-  patch -p1 -i $srcdir/binutils-2.24-lto-testsuite.patch
+  patch -p1 -i $srcdir/$_pkgname-2.24-lto-testsuite.patch
 
   # fix gold testsuite with gcc-4.9 - commit ae447ddd
-  patch -p1 -i $srcdir/binutils-2.24-gold-testsuite-plugin.patch
+  patch -p1 -i $srcdir/$_pkgname-2.24-gold-testsuite-plugin.patch
 
   # fix issues with -static -fPIE -pie - commit 4199e3b8
-  patch -p1 -i $srcdir/binutils-2.24-shared-pie.patch
+  patch -p1 -i $srcdir/$_pkgname-2.24-shared-pie.patch
+
+  # open-ath9k-htc-firmware patch on xtensa-unknown-elf
+  [[ $_target == xtensa-unknown-elf ]] && patch -p1 -i ${srcdir}/$_pkgname-xtensa.patch
 
   mkdir ${srcdir}/$_pkgname-build
 }
diff --git a/cross/cross-gcc/PKGBUILD b/cross/cross-gcc/PKGBUILD
index 9a42b7e00..c8a8f3d9a 100644
--- a/cross/cross-gcc/PKGBUILD
+++ b/cross/cross-gcc/PKGBUILD
@@ -140,7 +140,7 @@ source=(#ftp://$_pkgname.gnu.org/pub/$_pkgname/releases/$_pkgname-${pkgver}/$_pk
         ftp://$_pkgname.gnu.org/pub/$_pkgname/snapshots/${_snapshot}/$_pkgname-${_snapshot}.tar.bz2
         $_pkgname-4.8-filename-output.patch
         $_pkgname-4.9-isl-0.13-hack.patch
-        $_pkgname-xtensa.patch
+        $_pkgname-xtensa.patch::https://raw.githubusercontent.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/$_pkgname.patch
         mips-kfreebsd-gnu.patch)
 md5sums=('24dfd67139fda4746d2deff18182611d'
          '40cb437805e2f7a006aa0d0c3098ab0f'
diff --git a/cross/cross-gcc/gcc-xtensa.patch b/cross/cross-gcc/gcc-xtensa.patch
deleted file mode 100644
index 9f43902be..000000000
--- a/cross/cross-gcc/gcc-xtensa.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From c7162b8a3db42e7faf47606d3aa3dd61e64aea17 Mon Sep 17 00:00:00 2001
-From: Sujith Manoharan <c_manoha@qca.qualcomm.com>
-Date: Mon, 7 Jan 2013 16:06:28 +0530
-Subject: [PATCH] gcc: AR9271/AR7010 config
-
-Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
----
- include/xtensa-config.h | 36 +++++++++++++++++-------------------
- 1 file changed, 17 insertions(+), 19 deletions(-)
-
-diff --git a/include/xtensa-config.h b/include/xtensa-config.h
-index 30f4f41..fe9b051 100644
---- a/include/xtensa-config.h
-+++ b/include/xtensa-config.h
-@@ -1,7 +1,7 @@
- /* Xtensa configuration settings.
--   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010
-+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-    Free Software Foundation, Inc.
--   Contributed by Bob Wilson (bob.wilson@acm.org) at Tensilica.
-+   Contributed by Bob Wilson (bwilson@tensilica.com) at Tensilica.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -44,10 +44,7 @@
- #define XCHAL_HAVE_L32R			1
- 
- #undef XSHAL_USE_ABSOLUTE_LITERALS
--#define XSHAL_USE_ABSOLUTE_LITERALS	0
--
--#undef XSHAL_HAVE_TEXT_SECTION_LITERALS
--#define XSHAL_HAVE_TEXT_SECTION_LITERALS 1 /* Set if there is some memory that allows both code and literals.  */
-+#define XSHAL_USE_ABSOLUTE_LITERALS	1
- 
- #undef XCHAL_HAVE_MAC16
- #define XCHAL_HAVE_MAC16		0
-@@ -59,10 +56,10 @@
- #define XCHAL_HAVE_MUL32		1
- 
- #undef XCHAL_HAVE_MUL32_HIGH
--#define XCHAL_HAVE_MUL32_HIGH		0
-+#define XCHAL_HAVE_MUL32_HIGH		1
- 
- #undef XCHAL_HAVE_DIV32
--#define XCHAL_HAVE_DIV32		1
-+#define XCHAL_HAVE_DIV32		0
- 
- #undef XCHAL_HAVE_NSA
- #define XCHAL_HAVE_NSA			1
-@@ -103,8 +100,6 @@
- #undef XCHAL_HAVE_FP_RSQRT
- #define XCHAL_HAVE_FP_RSQRT		0
- 
--#undef XCHAL_HAVE_DFP_accel
--#define XCHAL_HAVE_DFP_accel			0
- #undef XCHAL_HAVE_WINDOWED
- #define XCHAL_HAVE_WINDOWED		1
- 
-@@ -119,32 +114,32 @@
- 
- 
- #undef XCHAL_ICACHE_SIZE
--#define XCHAL_ICACHE_SIZE		16384
-+#define XCHAL_ICACHE_SIZE		0
- 
- #undef XCHAL_DCACHE_SIZE
--#define XCHAL_DCACHE_SIZE		16384
-+#define XCHAL_DCACHE_SIZE		0
- 
- #undef XCHAL_ICACHE_LINESIZE
--#define XCHAL_ICACHE_LINESIZE		32
-+#define XCHAL_ICACHE_LINESIZE		16
- 
- #undef XCHAL_DCACHE_LINESIZE
--#define XCHAL_DCACHE_LINESIZE		32
-+#define XCHAL_DCACHE_LINESIZE		16
- 
- #undef XCHAL_ICACHE_LINEWIDTH
--#define XCHAL_ICACHE_LINEWIDTH		5
-+#define XCHAL_ICACHE_LINEWIDTH		4
- 
- #undef XCHAL_DCACHE_LINEWIDTH
--#define XCHAL_DCACHE_LINEWIDTH		5
-+#define XCHAL_DCACHE_LINEWIDTH		4
- 
- #undef XCHAL_DCACHE_IS_WRITEBACK
--#define XCHAL_DCACHE_IS_WRITEBACK	1
-+#define XCHAL_DCACHE_IS_WRITEBACK	0
- 
- 
- #undef XCHAL_HAVE_MMU
- #define XCHAL_HAVE_MMU			1
- 
- #undef XCHAL_MMU_MIN_PTE_PAGE_SIZE
--#define XCHAL_MMU_MIN_PTE_PAGE_SIZE	12
-+#define XCHAL_MMU_MIN_PTE_PAGE_SIZE	29
- 
- 
- #undef XCHAL_HAVE_DEBUG
-@@ -157,8 +152,11 @@
- #define XCHAL_NUM_DBREAK		2
- 
- #undef XCHAL_DEBUGLEVEL
--#define XCHAL_DEBUGLEVEL		6
-+#define XCHAL_DEBUGLEVEL		4
-+
- 
-+#undef XCHAL_EXCM_LEVEL
-+#define XCHAL_EXCM_LEVEL                3
- 
- #undef XCHAL_MAX_INSTRUCTION_SIZE
- #define XCHAL_MAX_INSTRUCTION_SIZE	3
--- 
-1.8.1
-