summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoenig, Joerg <Joerg.Koenig@techsat.com>2021-09-24 15:50:39 (GMT)
committerKoenig, Joerg <Joerg.Koenig@techsat.com>2021-09-24 15:50:39 (GMT)
commitaea77f47b6cf71967b97bb87df0005c5a4edbd55 (patch)
tree1d39047962585680ab2643c54a18d45c77fd66ad
parent730049d9c33d3dc9cfa417ba3d51cbbb3bca25fa (diff)
downloadgcc-compiler-suite-aea77f47b6cf71967b97bb87df0005c5a4edbd55.zip
gcc-compiler-suite-aea77f47b6cf71967b97bb87df0005c5a4edbd55.tar.gz
gcc-compiler-suite-aea77f47b6cf71967b97bb87df0005c5a4edbd55.tar.bz2
Updated to GCC 11.2, MinGW 9.0 and binutils 2.37refs/changes/95/16895/1
Change-Id: I1a443beba0ed44ebc6c0f29d53c9050603dcb7cf
-rw-r--r--Makefile3
-rw-r--r--PATCHES/0020-binutil-2.37_RUST_NO_RECURSION_LIMIT_mingw.patch16
2 files changed, 18 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a46c04b..73d238d 100644
--- a/Makefile
+++ b/Makefile
@@ -174,7 +174,8 @@ prepare:
patch -p1 < $(PATCHES_DIR)/0004-Windows-Use-not-in-progpath-and-leave-case-as-is.patch
tar -jxf $(SOURCE_DIR)/binutils-$(VERSION_BINUTILS).tar.bz2 -C $(UNPACK_DIR)/
cd $(UNPACK_DIR)/binutils-$(VERSION_BINUTILS) && \
- patch -p1 < $(PATCHES_DIR)/0004-Windows-Use-not-in-progpath-and-leave-case-as-is.patch
+ patch -p1 < $(PATCHES_DIR)/0004-Windows-Use-not-in-progpath-and-leave-case-as-is.patch && \
+ patch -p1 < $(PATCHES_DIR)/0020-binutil-2.37_RUST_NO_RECURSION_LIMIT_mingw.patch
tar -jxf $(SOURCE_DIR)/mingw-w64-v$(VERSION_MINGW).tar.bz2 -C $(UNPACK_DIR)/
cd $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/ && \
patch -p1 < $(PATCHES_DIR)/0025-crt-Undefine-__rdtsc-for-GCC-11.patch
diff --git a/PATCHES/0020-binutil-2.37_RUST_NO_RECURSION_LIMIT_mingw.patch b/PATCHES/0020-binutil-2.37_RUST_NO_RECURSION_LIMIT_mingw.patch
new file mode 100644
index 0000000..42a09d4
--- /dev/null
+++ b/PATCHES/0020-binutil-2.37_RUST_NO_RECURSION_LIMIT_mingw.patch
@@ -0,0 +1,16 @@
+diff -ruNb binutils-2.37.orig/libiberty/rust-demangle.c binutils-2.37/libiberty/rust-demangle.c
+--- binutils-2.37.orig/libiberty/rust-demangle.c 2021-07-15 16:19:46.000000000 +0200
++++ binutils-2.37/libiberty/rust-demangle.c 2021-09-24 07:38:20.014724822 +0200
+@@ -75,10 +75,10 @@
+ int version;
+
+ /* Recursion depth. */
+- uint recursion;
++ unsigned int recursion;
+ /* Maximum number of times demangle_path may be called recursively. */
+ #define RUST_MAX_RECURSION_COUNT 1024
+-#define RUST_NO_RECURSION_LIMIT ((uint) -1)
++#define RUST_NO_RECURSION_LIMIT ((unsigned int) -1)
+
+ uint64_t bound_lifetime_depth;
+ };