From 181311110345ca660b631314b2c3f19a13165bf9 Mon Sep 17 00:00:00 2001
From: Jason Self <j@jxself.org>
Date: Mon, 28 May 2018 13:32:15 -0700
Subject: [PATCH] ath9k_htc: Update to current master

Based on commit 014ff6fde0fab968eb5b4365e83a93a2fff452c2 dated
Jan 28 2018.
---
 WHENCE                                        |  4 +-
 ath9k_htc/.gitattributes                      |  2 -
 ath9k_htc/Makefile                            | 24 ++++-----
 .../local/patches/binutils-2.27_fixup.patch   | 13 -----
 ath9k_htc/local/patches/gcc-6.3.0_fixup.patch | 49 -------------------
 ath9k_htc/local/patches/gcc.patch2            | 13 -----
 6 files changed, 14 insertions(+), 91 deletions(-)
 delete mode 100644 ath9k_htc/.gitattributes
 delete mode 100644 ath9k_htc/local/patches/binutils-2.27_fixup.patch
 delete mode 100644 ath9k_htc/local/patches/gcc-6.3.0_fixup.patch
 delete mode 100644 ath9k_htc/local/patches/gcc.patch2

diff --git a/WHENCE b/WHENCE
index 09dd5e9..dd8ec20 100644
--- a/WHENCE
+++ b/WHENCE
@@ -103,8 +103,8 @@ From http://wiki.erazor-zone.de/doku.php?id=wiki:projects:linux:as31
 
 Driver: ath9k_htc - Atheros HTC devices (USB)
 
-Version: Based on commit d19607454d656cb14d8c16dfbf161eebb542e8fe 
-dated June 25 2017
+Version: Based on commit 014ff6fde0fab968eb5b4365e83a93a2fff452c2
+dated January 28 2018
 
 Licence: Free software. See ath9k_htc/LICENCE.TXT for details.
 
diff --git a/ath9k_htc/.gitattributes b/ath9k_htc/.gitattributes
deleted file mode 100644
index d1564d7..0000000
--- a/ath9k_htc/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-.gitattributes export-ignore
-.gitignore export-ignore
\ No newline at end of file
diff --git a/ath9k_htc/Makefile b/ath9k_htc/Makefile
index ee5e61b..599107a 100644
--- a/ath9k_htc/Makefile
+++ b/ath9k_htc/Makefile
@@ -1,14 +1,14 @@
-GMP_VER=6.1.1
+GMP_VER=6.1.2
 GMP_URL=https://ftp.gnu.org/gnu/gmp/gmp-$(GMP_VER).tar.bz2
 GMP_TAR=gmp-$(GMP_VER).tar.bz2
 GMP_DIR=gmp-$(GMP_VER)
-GMP_SUM=a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6
+GMP_SUM=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2
 
-MPFR_VER=3.1.4
+MPFR_VER=3.1.6
 MPFR_URL=https://ftp.gnu.org/gnu/mpfr/mpfr-$(MPFR_VER).tar.bz2
 MPFR_TAR=mpfr-$(MPFR_VER).tar.bz2
 MPFR_DIR=mpfr-$(MPFR_VER)
-MPFR_SUM=d3103a80cdad2407ed581f3618c4bed04e0c92d1cf771a65ead662cc397f7775
+MPFR_SUM=cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068
 
 MPC_VER=1.0.3
 MPC_URL=https://ftp.gnu.org/gnu/mpc/mpc-$(MPC_VER).tar.gz
@@ -16,19 +16,19 @@ MPC_TAR=mpc-$(MPC_VER).tar.gz
 MPC_DIR=mpc-$(MPC_VER)
 MPC_SUM=617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3
 
-BINUTILS_VER=2.27
+BINUTILS_VER=2.29
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/binutils-$(BINUTILS_VER).tar.bz2
 BINUTILS_TAR=binutils-$(BINUTILS_VER).tar.bz2
 BINUTILS_DIR=binutils-$(BINUTILS_VER)
-BINUTILS_PATCHES=local/patches/binutils.patch local/patches/binutils-2.27_fixup.patch
-BINUTILS_SUM=369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
+BINUTILS_PATCHES=local/patches/binutils.patch
+BINUTILS_SUM=29a29549869039aad75fdf507ac30366da5ad0b974fbff4a8e7148dbf4f40ebf
 
-GCC_VER=6.3.0
-GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VER)/gcc-$(GCC_VER).tar.bz2
-GCC_TAR=gcc-$(GCC_VER).tar.bz2
+GCC_VER=7.2.0
+GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VER)/gcc-$(GCC_VER).tar.gz
+GCC_TAR=gcc-$(GCC_VER).tar.gz
 GCC_DIR=gcc-$(GCC_VER)
-GCC_PATCHES=local/patches/gcc.patch local/patches/gcc-6.3.0_fixup.patch local/patches/gcc.patch2
-GCC_SUM=f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f
+GCC_PATCHES=local/patches/gcc.patch
+GCC_SUM=0153a003d3b433459336a91610cca2995ee0fb3d71131bd72555f2231a6efcfc
 
 BASEDIR=$(shell pwd)
 TOOLCHAIN_DIR=$(BASEDIR)/toolchain
diff --git a/ath9k_htc/local/patches/binutils-2.27_fixup.patch b/ath9k_htc/local/patches/binutils-2.27_fixup.patch
deleted file mode 100644
index fb61345..0000000
--- a/ath9k_htc/local/patches/binutils-2.27_fixup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index d062044..ca261ae 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -2228,7 +2228,7 @@ xg_reverse_shift_count (char **cnt_argp)
-   cnt_arg = *cnt_argp;
- 
-   /* replace the argument with "31-(argument)" */
--  new_arg = concat ("31-(", cnt_argp, ")", (char *) NULL);
-+  new_arg = concat ("31-(", cnt_arg, ")", (char *) NULL);
- 
-   free (cnt_arg);
-   *cnt_argp = new_arg;
diff --git a/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch b/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch
deleted file mode 100644
index 681c0ee..0000000
--- a/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 015dd1049fb..df80ad9117e 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -1780,7 +1780,8 @@ xtensa_emit_call (int callop, rtx *operands)
-   rtx tgt = operands[callop];
- 
-   if (GET_CODE (tgt) == CONST_INT)
--    sprintf (result, "call%d\t0x%lx", WINDOW_SIZE, INTVAL (tgt));
-+    sprintf (result, "call%d\t" HOST_WIDE_INT_PRINT_HEX,
-+	     WINDOW_SIZE, INTVAL (tgt));
-   else if (register_operand (tgt, VOIDmode))
-     sprintf (result, "callx%d\t%%%d", WINDOW_SIZE, callop);
-   else
-@@ -2351,14 +2352,14 @@ print_operand (FILE *file, rtx x, int letter)
- 
-     case 'L':
-       if (GET_CODE (x) == CONST_INT)
--	fprintf (file, "%ld", (32 - INTVAL (x)) & 0x1f);
-+	fprintf (file, HOST_WIDE_INT_PRINT_DEC, (32 - INTVAL (x)) & 0x1f);
-       else
- 	output_operand_lossage ("invalid %%L value");
-       break;
- 
-     case 'R':
-       if (GET_CODE (x) == CONST_INT)
--	fprintf (file, "%ld", INTVAL (x) & 0x1f);
-+	fprintf (file, HOST_WIDE_INT_PRINT_DEC, INTVAL (x) & 0x1f);
-       else
- 	output_operand_lossage ("invalid %%R value");
-       break;
-@@ -2372,7 +2373,7 @@ print_operand (FILE *file, rtx x, int letter)
- 
-     case 'd':
-       if (GET_CODE (x) == CONST_INT)
--	fprintf (file, "%ld", INTVAL (x));
-+	fprintf (file, HOST_WIDE_INT_PRINT_DEC, INTVAL (x));
-       else
- 	output_operand_lossage ("invalid %%d value");
-       break;
-@@ -2437,7 +2438,7 @@ print_operand (FILE *file, rtx x, int letter)
-       else if (GET_CODE (x) == MEM)
- 	output_address (GET_MODE (x), XEXP (x, 0));
-       else if (GET_CODE (x) == CONST_INT)
--	fprintf (file, "%ld", INTVAL (x));
-+	fprintf (file, HOST_WIDE_INT_PRINT_DEC, INTVAL (x));
-       else
- 	output_addr_const (file, x);
-     }
diff --git a/ath9k_htc/local/patches/gcc.patch2 b/ath9k_htc/local/patches/gcc.patch2
deleted file mode 100644
index 4d82574..0000000
--- a/ath9k_htc/local/patches/gcc.patch2
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gcc/ubsan.c b/gcc/ubsan.c
-index 56637d8..1093824 100644
---- a/gcc/ubsan.c
-+++ b/gcc/ubsan.c
-@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc)
- 
-   expanded_location xloc = expand_location (loc);
-   if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0
--      || xloc.file == '\0' || xloc.file[0] == '\xff'
-+      || xloc.file[0] == '\0' || xloc.file[0] == '\xff'
-       || xloc.file[1] == '\xff')
-     return false;
- 
-- 
2.31.1