From 9946ff98496a5a40f775a9f58353476a7a248619 Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 20 Aug 2018 17:07:33 -0300 Subject: upgpkg: libre/linux-libre-firmware 1:1.3-1 Signed-off-by: David P --- libre/linux-libre-firmware/PKGBUILD | 32 ++- ...install-ath9k_htc-on-prefix-ath9k_htc-too.patch | 45 ---- .../remove-external-toolchains.patch | 261 ++++++++------------- 3 files changed, 108 insertions(+), 230 deletions(-) delete mode 100644 libre/linux-libre-firmware/install-ath9k_htc-on-prefix-ath9k_htc-too.patch (limited to 'libre/linux-libre-firmware') diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index cb6ebb17d..3534a93ea 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -4,14 +4,14 @@ # Contributor: Luke Shumaker pkgname=linux-libre-firmware -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3 +pkgrel=1 epoch=1 pkgdesc='Firmware files for Linux-libre' arch=('any') url='https://jxself.org/firmware' license=('GPL3' 'GPL2') -makedepends=('cmake' 'arm-linux-gnueabi-gcc' 'sh-elf-gcc' 'sh-elf-newlib' 'xtensa-elf-gcc') +makedepends=('arm-linux-gnueabi-gcc' 'arm-none-eabi-gcc' 'cmake' 'sh-elf-gcc' 'sh-elf-newlib' 'xtensa-elf-gcc') provides=('linux-firmware') conflicts=('linux-firmware' 'linux-firmware-git' @@ -30,34 +30,30 @@ conflicts=('linux-firmware' 'openfwwf' 'ath9k-htc-firmware') replaces=(${conflicts[@]}) -options=(!buildflags) -source=("$url/$pkgname-$pkgver.tar.lz"{,.asc} 'remove-external-toolchains.patch' 'install-ath9k_htc-on-prefix-ath9k_htc-too.patch') -sha512sums=('dc4f2e931b4dde217f2e3430e7a0c1a5f42f0844087bf9a771c7e40dbdd8050205d7a80495bd130f87a02a823db7514241d68bfded19548132b3620d4c7e630a' +options=(!buildflags !makeflags) +source=("$url/$pkgname-$pkgver.tar.lz"{,.asc} 'remove-external-toolchains.patch') +sha512sums=('d3ead6924e686d0212c5993386fdf7ed1d2f68cb899517510ef488b2006a7bb9c1a8e511d23622e0342bdc70410c90291aad60adb2ac5db20c00b40a11508700' 'SKIP' - '474fcfad6c447fded19c8d678b5e29e21d6e1406a3350453e483fd1fe4031c5b3da754fdb94174a538c026ab0b266f7f794f60868c5d6b438aacbdbd214c1046' - '9aea747fe09593ca407cb638964613720f871cbf2ae480b300e881d3f209692dace6f7c3ee65478a8f3715949bc8b41460dbd25344433df9facdcf318815a177') + '2d45a7afd7e22bf558a24fa7777976ee6bbe5aa7c73b6fcccab32c28c52bb76de2647e5b8c1560bb6f9dd0e2e5c36befb1a776257c5f412437cdaa8f96290864') validpgpkeys=('F611A908FFA165C699584ED49D0DB31B545A3198') # Jason Self prepare() { - cd $srcdir/$pkgname-$pkgver/src + cd $srcdir/$pkgname-$pkgver # do not download toolchains so we can build offline - patch -p1 -i $srcdir/remove-external-toolchains.patch - - # https://labs.parabola.nu/issues/1445 - patch -p1 -i $srcdir/install-ath9k_htc-on-prefix-ath9k_htc-too.patch + patch -p0 -i ../remove-external-toolchains.patch } build() { - cd $srcdir/$pkgname-$pkgver/src - make + cd $srcdir/$pkgname-$pkgver + make -C src } package() { - cd $srcdir/$pkgname-$pkgver/src + cd $srcdir/$pkgname-$pkgver install -dm755 $pkgdir/usr/lib/firmware - make prefix=$pkgdir/usr/lib/firmware install + make -C src prefix=$pkgdir/usr/lib/firmware install - install -Dm644 WHENCE $pkgdir/usr/share/licenses/$pkgname/WHENCE + install -Dm644 src/WHENCE $pkgdir/usr/share/licenses/$pkgname/WHENCE } diff --git a/libre/linux-libre-firmware/install-ath9k_htc-on-prefix-ath9k_htc-too.patch b/libre/linux-libre-firmware/install-ath9k_htc-on-prefix-ath9k_htc-too.patch deleted file mode 100644 index 2d2f82574..000000000 --- a/libre/linux-libre-firmware/install-ath9k_htc-on-prefix-ath9k_htc-too.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 432e85147a167f1fec75464f97e28326c9b95c3c Mon Sep 17 00:00:00 2001 -From: David P -Date: Fri, 18 May 2018 13:22:54 -0400 -Subject: [PATCH] install ath9k_htc on $(prefix)/ath9k_htc too - -Having ath9k_htc fw files installed at $(prefix)/ makes it work, but not having them in $(prefix)/ath9k_htc -causes the following: - -[ 8.952592] usb 3-2: ath9k_htc: Firmware ath9k_htc/htc_9271-1.4.0.fw requested -[ 8.952652] usb 3-2: Direct firmware load for ath9k_htc/htc_9271-1.4.0.fw failed with error -2 -[ 8.952655] usb 3-2: ath9k_htc: Firmware htc_9271.fw requested - -Although the firmware works, it throws that (benign) error, that's why linux-firmware installs it in both, -/lib/firmware and /lib/firmware/ath9k_htc, and this patch fixes this. - -[ 3.929726] Workqueue: events request_firmware_work_func -[ 3.929769] ? _request_firmware+0x423/0xcc0 -[ 3.929772] request_firmware_work_func+0x47/0x90 -[ 5.408573] usb 3-2: ath9k_htc: Firmware ath9k_htc/htc_9271-1.4.0.fw requested - -Signed-off-by: David P ---- - src/Makefile | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git src/Makefile src/Makefile -index c2b8451..2a78f98 100644 ---- src/Makefile -+++ src/Makefile -@@ -83,8 +83,10 @@ clean: - cd usbdux && $(MAKE) -f Makefile_dux clean - - install: -- if [ -a ath9k_htc/target_firmware/htc_9271.fw ]; then $(install_program) -D ath9k_htc/target_firmware/htc_9271.fw $(prefix)/htc_9271.fw; fi; -- if [ -a ath9k_htc/target_firmware/htc_7010.fw ]; then $(install_program) -D ath9k_htc/target_firmware/htc_7010.fw $(prefix)/htc_7010.fw; fi; -+ if [ -a ath9k_htc/target_firmware/htc_9271.fw ]; then $(install_program) -D ath9k_htc/target_firmware/htc_9271.fw $(prefix)/ath9k_htc/htc_9271-1.4.0.fw && \ -+ ln -s ath9k_htc/htc_9271-1.4.0.fw $(prefix)/htc_9271.fw; fi; -+ if [ -a ath9k_htc/target_firmware/htc_7010.fw ]; then $(install_program) -D ath9k_htc/target_firmware/htc_7010.fw $(prefix)/ath9k_htc/htc_7010-1.4.0.fw && \ -+ ln -s ath9k_htc/htc_7010-1.4.0.fw $(prefix)/htc_7010.fw; fi; - if [ -a av7110/bootcode.bin ]; then $(install_program) -D av7110/bootcode.bin $(prefix)/av7110/bootcode.bin; fi; - if [ -a cis/3CCFEM556.cis ]; then $(install_program) -D cis/3CCFEM556.cis $(prefix)/cis/3CCFEM556.cis; fi; - if [ -a cis/3CXEM556.cis ]; then $(install_program) -D cis/3CXEM556.cis $(prefix)/cis/3CXEM556.cis; fi; --- -2.17.0 - diff --git a/libre/linux-libre-firmware/remove-external-toolchains.patch b/libre/linux-libre-firmware/remove-external-toolchains.patch index c38a20821..a84b5cf95 100644 --- a/libre/linux-libre-firmware/remove-external-toolchains.patch +++ b/libre/linux-libre-firmware/remove-external-toolchains.patch @@ -1,6 +1,6 @@ -From 56777561f6ff815ba8a8010ced3612997690e458 Mon Sep 17 00:00:00 2001 +From 9c3baae5a5a78fddc3e8d9e66b73cf08863c2daf Mon Sep 17 00:00:00 2001 From: David P -Date: Thu, 10 May 2018 22:27:41 -0300 +Date: Mon, 20 Aug 2018 16:31:34 -0300 Subject: [PATCH] remove external toolchains Make ath9k_htc and carl9170fw build without depending on downloading compilers, and @@ -26,64 +26,81 @@ Changes to src: Signed-off-by: David P --- - src/INSTALL | 10 +- - src/Makefile | 19 +- - src/ath9k_htc/.travis.yml | 1 - - src/ath9k_htc/Makefile | 146 +- - src/ath9k_htc/README | 14 +- - src/ath9k_htc/local/patches/binutils-2.27_fixup.patch | 13 - - src/ath9k_htc/local/patches/binutils.patch | 28962 ------------------------------------ - src/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch | 49 - - src/ath9k_htc/local/patches/gcc.patch | 92 - - src/ath9k_htc/local/patches/gcc.patch2 | 13 - - src/ath9k_htc/target_firmware/configure | 2 +- - src/carl9170fw/README.md | 11 - - src/carl9170fw/extra/sh-elf-linux.cmake | 16 +- - src/carl9170fw/toolchain/Makefile | 104 - - src/carl9170fw/toolchain/SHA256SUMS | 14 - - 15 files changed, 28 insertions(+), 29438 deletions(-) + src/INSTALL | 14 +- + src/Makefile | 19 +- + src/ath9k_htc/.travis.yml | 1 - + src/ath9k_htc/Makefile | 147 +- + src/ath9k_htc/README | 14 +- + src/ath9k_htc/local/patches/binutils.patch | 28962 ------------------- + src/ath9k_htc/local/patches/gcc.patch | 92 - + src/ath9k_htc/target_firmware/configure | 2 +- + src/carl9170fw/README.md | 11 - + src/carl9170fw/extra/sh-elf-linux.cmake | 16 +- + src/carl9170fw/toolchain/Makefile | 104 - + src/carl9170fw/toolchain/SHA256SUMS | 16 - + 12 files changed, 30 insertions(+), 29368 deletions(-) + delete mode 100644 src/ath9k_htc/local/patches/binutils.patch + delete mode 100644 src/ath9k_htc/local/patches/gcc.patch + delete mode 100644 src/carl9170fw/toolchain/Makefile + delete mode 100644 src/carl9170fw/toolchain/SHA256SUMS diff --git src/INSTALL src/INSTALL -index dfabf2a..be6c905 100644 +index 74c5cfd..83fd648 100644 --- src/INSTALL +++ src/INSTALL -@@ -20,11 +20,19 @@ system: - * GNU Flex - * GNU Gperf - * GNU Make -- * GNU Wget -+ * Newlib for sh-elf target - * GNU C cross-compiler for ARM: - - arm-linux-gnueabi-gcc - - arm-linux-gnueabi-ld - - arm-linux-gnueabi-objcopy -+ * GNU C cross-compiler for Xtensa: -+ - xtensa-elf-gcc -+ - xtensa-elf-ld -+ - xtensa-elf-objcopy -+ * GNU C cross-compiler for SuperH: -+ - sh-elf-gcc -+ - sh-elf-ld -+ - sh-elf-objcopy +@@ -21,7 +21,7 @@ system: + * GNU Flex + * GNU Gperf + * GNU Make +- * GNU Wget ++ * Newlib for SuperH (sh-elf) + * GNU C cross-compiler for ARM: + - arm-linux-gnueabi-gcc + - arm-linux-gnueabi-ld +@@ -29,11 +29,19 @@ system: + - arm-none-eabi-gcc + - arm-none-eabi-objcopy + - arm-none-eabi-as ++ * GNU C cross-compiler for Xtensa: ++ - xtensa-elf-gcc ++ - xtensa-elf-ld ++ - xtensa-elf-objcopy ++ * GNU C cross-compiler for SuperH: ++ - sh-elf-gcc ++ - sh-elf-ld ++ - sh-elf-objcopy + + On GNU/Linux distros that use apt you can install these with: + + apt install binutils-arm-linux-gnueabi binutils-arm-none-eabi bison \ +- cmake flex g++ gcc gcc-arm-linux-gnueabi gcc-arm-none-eabi gperf make wget ++ cmake flex g++ gcc gcc-arm-linux-gnueabi gcc-arm-none-eabi gperf make CARL9170 Firmware Configuration When building the carl9170 firmware you will be prompted with +@@ -45,4 +53,4 @@ Licensing + You can redistribute and/or modify this file under the terms of the + GNU General Public License as published by the Free Software + Foundation, either version 3 of the License, or (at your option) any +-later version. +\ No newline at end of file ++later version. diff --git src/Makefile src/Makefile -index 122f659..c2b8451 100644 +index 1a9ceb6..9980d19 100644 --- src/Makefile +++ src/Makefile @@ -17,7 +17,7 @@ shell=/bin/sh prefix=/lib/firmware install_program=install --.PHONY: all test clean install a56 as31 ath9k_htc_toolchain ath9k_htc_firmware av7110 b43-tools carl9170fw-toolchain carl9170fw cis-tools cis dsp56k ihex2fw isci keyspan_pda openfwwf usbdux -+.PHONY: all test clean install a56 as31 ath9k_htc ath9k_htc_firmware av7110 b43-tools carl9170fw cis-tools cis dsp56k ihex2fw isci keyspan_pda openfwwf usbdux +-.PHONY: all test clean install a56 as31 aica ath9k_htc_toolchain ath9k_htc_firmware av7110 b43-tools carl9170fw-toolchain carl9170fw cis-tools cis dsp56k ihex2fw isci keyspan_pda openfwwf usbdux ++.PHONY: all test clean install a56 as31 aica ath9k_htc_firmware av7110 b43-tools carl9170fw cis-tools cis dsp56k ihex2fw isci keyspan_pda openfwwf usbdux - all: ath9k_htc av7110 carl9170fw cis dsp56k isci keyspan_pda openfwwf usbdux + all: aica ath9k_htc av7110 carl9170fw cis dsp56k isci keyspan_pda openfwwf usbdux -@@ -27,11 +27,8 @@ a56: - as31: - cd as31 && ./configure && $(MAKE) +@@ -30,11 +30,8 @@ as31: + aica: + cd aica/arm && $(MAKE) -ath9k_htc_toolchain: - cd ath9k_htc && $(MAKE) toolchain @@ -95,7 +112,7 @@ index 122f659..c2b8451 100644 av7110: cd av7110 && $(MAKE) -@@ -39,11 +36,8 @@ av7110: +@@ -42,11 +39,8 @@ av7110: b43-tools: cd b43-tools/assembler && $(MAKE) @@ -109,8 +126,8 @@ index 122f659..c2b8451 100644 cis: cis-tools cd cis && $(MAKE) -@@ -75,10 +69,9 @@ test: - clean: +@@ -79,10 +73,9 @@ clean: + cd aica/arm && $(MAKE) clean cd a56 && $(MAKE) clean if [ -a as31/Makefile ]; then cd as31 && $(MAKE) clean; fi; - cd ath9k_htc && $(MAKE) toolchain-clean @@ -133,21 +150,21 @@ index cfb0ee1..5a8db8f 100644 - make -C target_firmware - make -C target_firmware clean diff --git src/ath9k_htc/Makefile src/ath9k_htc/Makefile -index ee5e61b..f92feb8 100644 +index 599107a..958eaaa 100644 --- src/ath9k_htc/Makefile +++ src/ath9k_htc/Makefile -@@ -1,149 +1,9 @@ --GMP_VER=6.1.1 +@@ -1,149 +1,8 @@ +-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 @@ -155,19 +172,19 @@ index ee5e61b..f92feb8 100644 -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 @@ -272,8 +289,8 @@ index ee5e61b..f92feb8 100644 -clean-dl: -download: -toolchain: +- +all: firmware - clean: $(MAKE) -C target_firmware clean @@ -314,25 +331,6 @@ index 93823e4..bd14e8f 100644 * Next, build the firmware. -diff --git src/ath9k_htc/local/patches/binutils-2.27_fixup.patch src/ath9k_htc/local/patches/binutils-2.27_fixup.patch -deleted file mode 100644 -index fb61345..0000000 ---- src/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 src/ath9k_htc/local/patches/binutils.patch src/ath9k_htc/local/patches/binutils.patch deleted file mode 100644 index 8246771..0000000 @@ -29301,61 +29299,6 @@ index 8246771..0000000 --- -1.8.1 - -diff --git src/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch src/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch -deleted file mode 100644 -index 681c0ee..0000000 ---- src/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 src/ath9k_htc/local/patches/gcc.patch src/ath9k_htc/local/patches/gcc.patch deleted file mode 100644 index b26cc56..0000000 @@ -29454,25 +29397,6 @@ index b26cc56..0000000 - - #undef XCHAL_MAX_INSTRUCTION_SIZE - #define XCHAL_MAX_INSTRUCTION_SIZE 3 -diff --git src/ath9k_htc/local/patches/gcc.patch2 src/ath9k_htc/local/patches/gcc.patch2 -deleted file mode 100644 -index 4d82574..0000000 ---- src/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; -- diff --git src/ath9k_htc/target_firmware/configure src/ath9k_htc/target_firmware/configure index e2d4639..6e49093 100755 --- src/ath9k_htc/target_firmware/configure @@ -29542,33 +29466,33 @@ index 3fdf98c..c0b1e84 100644 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) diff --git src/carl9170fw/toolchain/Makefile src/carl9170fw/toolchain/Makefile deleted file mode 100644 -index 3ee93a9..0000000 +index 11db906..0000000 --- src/carl9170fw/toolchain/Makefile +++ /dev/null @@ -1,104 +0,0 @@ --BINUTILS_VER=2.30 +-BINUTILS_VER=2.31.1 -BINUTILS_TAR=binutils-$(BINUTILS_VER).tar.xz --BINUTILS_URL="http://ftpmirror.gnu.org/gnu/binutils/$(BINUTILS_TAR)" +-BINUTILS_URL="https://ftp.gnu.org/gnu/binutils/$(BINUTILS_TAR)" - -NEWLIB_VER=3.0.0 -NEWLIB_TAR=newlib-$(NEWLIB_VER).tar.gz -NEWLIB_URL="ftp://sourceware.org/pub/newlib/$(NEWLIB_TAR)" - --GCC_VER=7.3.0 +-GCC_VER=8.2.0 -GCC_TAR=gcc-$(GCC_VER).tar.xz --GCC_URL="http://ftpmirror.gnu.org/gnu/gcc/gcc-$(GCC_VER)/$(GCC_TAR)" +-GCC_URL="https://ftp.gnu.org/gnu/gcc/gcc-$(GCC_VER)/$(GCC_TAR)" - -MPFR_VER=4.0.1 -MPFR_TAR=mpfr-$(MPFR_VER).tar.xz --MPFR_URL="http://ftpmirror.gnu.org/gnu/mpfr/$(MPFR_TAR)" +-MPFR_URL="https://ftp.gnu.org/gnu/mpfr/$(MPFR_TAR)" - -GMP_VER=6.1.2 -GMP_TAR=gmp-$(GMP_VER).tar.xz --GMP_URL="http://ftpmirror.gnu.org/gnu/gmp/$(GMP_TAR)" +-GMP_URL="https://ftp.gnu.org/gnu/gmp/$(GMP_TAR)" - -MPC_VER=1.1.0 -MPC_TAR=mpc-$(MPC_VER).tar.gz --MPC_URL="http://ftpmirror.gnu.org/gnu/mpc/$(MPC_TAR)" +-MPC_URL="https://ftp.gnu.org/gnu/mpc/$(MPC_TAR)" - -JOBS?=$(shell grep -c ^processor /proc/cpuinfo) - @@ -29652,10 +29576,10 @@ index 3ee93a9..0000000 - rm -rf "$(BASEDIR)/src" diff --git src/carl9170fw/toolchain/SHA256SUMS src/carl9170fw/toolchain/SHA256SUMS deleted file mode 100644 -index 99505e4..0000000 +index 1b65040..0000000 --- src/carl9170fw/toolchain/SHA256SUMS +++ /dev/null -@@ -1,14 +0,0 @@ +@@ -1,16 +0,0 @@ -1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a src/gcc-7.2.0.tar.xz -5b76a9b97c9464209772ed25ce55181a7bb144a66e5669aaec945aa64da3189b src/newlib-2.5.0.tar.gz -0b871e271c4c620444f8264f72143b4d224aa305306d85dd77ab8dce785b1e85 src/binutils-2.29.tar.xz @@ -29669,7 +29593,10 @@ index 99505e4..0000000 -e7010a46969f9d3e53b650a518663f98a5dde3c3ae21b7d71e5e6803bc36b577 src/binutils-2.29.1.tar.xz -67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e src/mpfr-4.0.1.tar.xz -6e46b8aeae2f727a36f0bd9505e405768a72218f1796f0d09757d45209871ae6 src/binutils-2.30.tar.xz -- +-1d1866f992626e61349a1ccd0b8d5253816222cdc13390dcfaa74b093aa2b153 src/gcc-8.1.0.tar.xz +-5d20086ecf5752cc7d9134246e9588fa201740d540f7eb84d795b1f7a93bca86 src/binutils-2.31.1.tar.xz +-196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080 src/gcc-8.2.0.tar.xz +\ No newline at end of file -- -2.17.0 +2.18.0 -- cgit v1.2.3