xtensa-unknown-elf-gcc: push xtensa patch to repo

4 files changed, 4 insertions, 186 deletions

diff --git a/cross/cross-gcc/PKGBUILD b/cross/cross-gcc/PKGBUILD
index 791f4fe22..e3856b951 100644
--- a/cross/cross-gcc/PKGBUILD
+++ b/cross/cross-gcc/PKGBUILD
@@ -109,6 +109,7 @@ fi
 _pkgname=gcc
 pkgname=$_target-$_pkgname
 pkgver=6.2.1
+_pkgverpatch=$pkgver
 _pkgver=6
 _islver=0.16.1
 pkgrel=1
@@ -122,7 +123,7 @@ checkdepends=('dejagnu' 'inetutils')
 options=('!emptydirs')
 source=(git://$_pkgname.gnu.org/git/$_pkgname.git#commit=${_commit}
         http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
-        $_pkgname-xtensa.patch
+        https://repo.parabola.nu/other/$_pkgname/$_pkgverpatch/$_pkgname-xtensa.patch)
         mips-kfreebsd-gnu.patch)
 md5sums=('SKIP'
          'ac1f25a0677912952718a51f5bc20f32'
diff --git a/cross/cross-gcc/gcc-xtensa.patch b/cross/cross-gcc/gcc-xtensa.patch
deleted file mode 100644
index b26cc568a..000000000
--- a/cross/cross-gcc/gcc-xtensa.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/include/xtensa-config.h b/include/xtensa-config.h
-index 5ae4c80..8397564 100644
---- a/include/xtensa-config.h
-+++ b/include/xtensa-config.h
-@@ -43,10 +43,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
-@@ -58,10 +55,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
-@@ -102,8 +99,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
- 
-@@ -118,32 +113,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
-@@ -156,8 +151,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
diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD
index ad02cb0e7..4ad9682dd 100644
--- a/libre/xtensa-unknown-elf-gcc/PKGBUILD
+++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD
@@ -4,6 +4,7 @@
 
 pkgname=xtensa-unknown-elf-gcc
 pkgver=6.2.1
+_pkgverpatch=$pkgver
 _pkgver=6
 _islver=0.16.1
 pkgrel=1
@@ -17,7 +18,7 @@ checkdepends=('dejagnu' 'inetutils')
 options=('!emptydirs')
 source=(git://gcc.gnu.org/git/gcc.git#commit=${_commit}
         http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
-        gcc-xtensa.patch)
+        https://repo.parabola.nu/other/gcc/$_pkgverpatch/gcc-xtensa.patch)
 md5sums=('SKIP'
          'ac1f25a0677912952718a51f5bc20f32'
          '5e0f13db1555fd3f70da9642ab180386')
diff --git a/libre/xtensa-unknown-elf-gcc/gcc-xtensa.patch b/libre/xtensa-unknown-elf-gcc/gcc-xtensa.patch
deleted file mode 100644
index b26cc568a..000000000
--- a/libre/xtensa-unknown-elf-gcc/gcc-xtensa.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/include/xtensa-config.h b/include/xtensa-config.h
-index 5ae4c80..8397564 100644
---- a/include/xtensa-config.h
-+++ b/include/xtensa-config.h
-@@ -43,10 +43,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
-@@ -58,10 +55,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
-@@ -102,8 +99,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
- 
-@@ -118,32 +113,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
-@@ -156,8 +151,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