diff options
| author | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2021-09-24 15:27:05 (GMT) |
|---|---|---|
| committer | Koenig, Joerg <Joerg.Koenig@techsat.com> | 2021-09-24 15:27:05 (GMT) |
| commit | 117b19e5cbebd40a3b758bddaf3b16aecc282eef (patch) | |
| tree | 5a89db6a8730a70c68f6f31060916bf2a9af6e49 | |
| parent | 343880dd5511ce70d18f953e332df1fd3381275e (diff) | |
| download | gcc-compiler-suite-117b19e5cbebd40a3b758bddaf3b16aecc282eef.zip gcc-compiler-suite-117b19e5cbebd40a3b758bddaf3b16aecc282eef.tar.gz gcc-compiler-suite-117b19e5cbebd40a3b758bddaf3b16aecc282eef.tar.bz2 | |
Update to gcc 11.2, MinGW9.0 and binutils 2.37refs/changes/92/16892/1
Resolves: :jira:<issue>
See also: :jira:<issue>
Change-Id: Ib5ef3f3c040d5cce4e8a0ef9a77fdbf11b3cfe7f
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | PATCHES/0020-binutil-2.37_RUST_NO_RECURSION_LIMIT_mingw.patch | 16 | ||||
| -rw-r--r-- | versions.mk.inc | 6 |
3 files changed, 24 insertions, 7 deletions
@@ -114,7 +114,7 @@ $(SOURCE_DIR)/gmp-$(VERSION_GMP).tar.lz: wget -c https://gmplib.org/download/gmp/gmp-$(VERSION_GMP).tar.lz -O \ $(SOURCE_DIR)/gmp-$(VERSION_GMP).tar.lz $(SOURCE_DIR)/mingw-w64-v$(VERSION_MINGW).tar.bz2: - wget -c https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v8.0.0.tar.bz2/download -O \ + wget -c https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v$(VERSION_MINGW).tar.bz2/download -O \ $(SOURCE_DIR)/mingw-w64-v$(VERSION_MINGW).tar.bz2 $(SOURCE_DIR)/mpc-$(VERSION_MPC).tar.gz: wget -c ftp://ftp.gnu.org/gnu/mpc/mpc-$(VERSION_MPC).tar.gz -O \ @@ -174,10 +174,9 @@ 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 tar -jxf $(SOURCE_DIR)/mpfr-$(VERSION_MPFR).tar.bz2 -C $(UNPACK_DIR)/ tar -jxf $(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2 -C $(UNPACK_DIR)/ tar -zxf $(SOURCE_DIR)/mpc-$(VERSION_MPC).tar.gz -C $(UNPACK_DIR)/ @@ -794,6 +793,8 @@ wingcc-finish: cp -f ../../x86_64-w64-mingw32/lib/libgcc_s.a . cd $(WINGCC_INST_DIR)/lib/gcc/$(XGCC_TARGET64)/$(VERSION_GCC)/32 && \ cp -f ../../../x86_64-w64-mingw32/lib32/libgcc_s.a . + cp $(XGCC_INST_DIR)/x86_64-w64-mingw32/lib32/libpthread.a \ + $(WINGCC_INST_DIR)/x86_64-w64-mingw32/lib32/ wingcc-reimp: rm -Rf $(BUILD_DIR)/reimp 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; + }; diff --git a/versions.mk.inc b/versions.mk.inc index 30899e3..7f02fda 100644 --- a/versions.mk.inc +++ b/versions.mk.inc @@ -1,8 +1,8 @@ SUITE = 1.9.0 -VERSION_BINUTILS = 2.36.1 -VERSION_GCC = 11.1.0 -VERSION_MINGW = 8.0.0 +VERSION_BINUTILS = 2.37 +VERSION_GCC = 11.2.0 +VERSION_MINGW = 9.0.0 VERSION_GMP = 6.2.0 VERSION_MPC = 1.1.0 VERSION_ISL = 0.18 |