From d00236b7613192a57cb8d3408472186147e57851 Mon Sep 17 00:00:00 2001
From: "Koenig, Joerg" <Joerg.Koenig@techsat.com>
Date: Wed, 27 Apr 2022 14:35:29 +0200
Subject: New Rel 1.10.0

Update SW as follows:
VERSION_BINUTILS       = 2.38
VERSION_GCC            = 11.3.0
VERSION_MINGW          = 10.0.0
VERSION_GMP            = 6.2.1
VERSION_MPC            = 1.2.1
VERSION_ISL            = 0.24
VERSION_MPFR           = 4.1.0
VERSION_GDB            = 11.2
VERSION_ZLIB           = 1.2.12

Change-Id: I116e02f9eeacf7ef1baa9afa70287a7821d83618
---
 Makefile                 |  20 ++++++++++++++------
 SOURCES/isl-0.18.tar.bz2 | Bin 1658291 -> 0 bytes
 versions.mk.inc          |  20 ++++++++++----------
 3 files changed, 24 insertions(+), 16 deletions(-)
 delete mode 100644 SOURCES/isl-0.18.tar.bz2

diff --git a/Makefile b/Makefile
index 12f3125..91fd07f 100644
--- a/Makefile
+++ b/Makefile
@@ -132,12 +132,12 @@ $(SOURCE_DIR)/bzip2-$(VERSION_BZ2).tar.gz:
 $(SOURCE_DIR)/gdb-$(VERSION_GDB).tar.gz:
 	$(WGET) -c ftp://sourceware.org/pub/gdb/releases/gdb-$(VERSION_GDB).tar.gz -O \
 		$(SOURCE_DIR)/gdb-$(VERSION_GDB).tar.gz
-#$(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2:
-#	$(WGET) -c "ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-$(VERSION_ISL).tar.bz2" -O \
-#		$(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2
 $(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2:
-	$(WGET) -c "http://isl.gforge.inria.fr/isl-$(VERSION_ISL).tar.bz2" -O \
+	$(WGET) -c "ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-$(VERSION_ISL).tar.bz2" -O \
 		$(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2
+#$(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2:
+#	$(WGET) -c "http://isl.gforge.inria.fr/isl-$(VERSION_ISL).tar.bz2" -O \
+#		$(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2
 
 download: $(SOURCE_PACKAGES)
 
@@ -175,8 +175,7 @@ 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)/0020-binutil-2.37_RUST_NO_RECURSION_LIMIT_mingw.patch
+		patch -p1 <  $(PATCHES_DIR)/0004-Windows-Use-not-in-progpath-and-leave-case-as-is.patch
 	tar -jxf $(SOURCE_DIR)/mingw-w64-v$(VERSION_MINGW).tar.bz2 -C $(UNPACK_DIR)/
 	tar -jxf $(SOURCE_DIR)/mpfr-$(VERSION_MPFR).tar.bz2 -C $(UNPACK_DIR)/
 	tar -jxf $(SOURCE_DIR)/isl-$(VERSION_ISL).tar.bz2 -C $(UNPACK_DIR)/
@@ -277,6 +276,8 @@ lingcc-finish:
 	find $(INST_BASE)/gcc -type f -name "*.py" | xargs rm -f
 
 lingcc-gdb:
+	cp -f $(BUILD_DIR)/gcc/gmp/.libs/libgmp.a $(INST_BASE)/gcc/lib64
+	cp -f $(BUILD_DIR)/gcc/gmp/gmp.h $(INST_BASE)/gcc/include
 	rm -Rf $(BUILD_DIR)/lingdb
 	mkdir -p $(BUILD_DIR)/lingdb
 	cd $(BUILD_DIR)/lingdb && \
@@ -289,6 +290,7 @@ lingcc-gdb:
 		--target=$(ARCH64) \
 		--host=$(ARCH64) \
 		--with-python=no \
+		--with-libgmp-prefix=$(INST_BASE)/gcc \
 		--build=$(ARCH64) && \
 	make $(JOBS) && make $(JOBS) install
 
@@ -505,6 +507,8 @@ xgcc-finish:
 	fi;
 
 xgcc-gdb:
+	cp -f $(BUILD_DIR)/gcc/gmp/.libs/libgmp.a $(XGCC_INST_DIR)/lib
+	cp -f $(BUILD_DIR)/gcc/gmp/gmp.h $(XGCC_INST_DIR)/include
 	rm -rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb
 	cd $(BUILD_DIR)/gdb && \
 	export PATH=$(XGCC_BINPATH):$(INST_BASE)/gcc/bin:$(PATH) && \
@@ -515,6 +519,7 @@ xgcc-gdb:
 		--prefix=$(XGCC_INST_DIR) \
 		--target=$(XGCC_TARGET64) \
 		--with-python=no \
+		--with-libgmp-prefix=$(XGCC_INST_DIR) \
 		--build=$(ARCH64) \
 		--host=$(ARCH64) && \
 	make $(JOBS) && make $(JOBS) install
@@ -942,6 +947,8 @@ wingcc-bzip2:
 	chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/lib/libbz2.a
 
 wingcc-gdb:
+	cp -f $(BUILD_DIR)/gcc/gmp/.libs/libgmp.a $(WINGCC_INST_DIR)/lib
+	cp -f $(BUILD_DIR)/gcc/gmp/gmp.h $(WINGCC_INST_DIR)/include
 	rm -Rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb
 	cd $(BUILD_DIR)/gdb && \
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
@@ -952,6 +959,7 @@ wingcc-gdb:
 		--prefix=$(WINGCC_INST_DIR) \
 		--target=$(XGCC_TARGET64) \
 		--with-python=no \
+		--with-libgmp-prefix=$(WINGCC_INST_DIR) \
 		--host=$(XGCC_TARGET64) \
 		--build=$(ARCH64) && \
 	make $(JOBS) && make $(JOBS) install
diff --git a/SOURCES/isl-0.18.tar.bz2 b/SOURCES/isl-0.18.tar.bz2
deleted file mode 100644
index 4c8296c..0000000
Binary files a/SOURCES/isl-0.18.tar.bz2 and /dev/null differ
diff --git a/versions.mk.inc b/versions.mk.inc
index 7f02fda..289f16c 100644
--- a/versions.mk.inc
+++ b/versions.mk.inc
@@ -1,13 +1,13 @@
-SUITE			= 1.9.0
+SUITE			= 1.10.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
-VERSION_MPFR		= 4.0.2
-VERSION_GDB		= 8.2
+VERSION_BINUTILS	= 2.38
+VERSION_GCC		= 11.3.0
+VERSION_MINGW		= 10.0.0
+VERSION_GMP		= 6.2.1
+VERSION_MPC		= 1.2.1
+VERSION_ISL		= 0.24
+VERSION_MPFR		= 4.1.0
+VERSION_GDB		= 11.2
 VERSION_BZ2		= 1.0.8
-VERSION_ZLIB		= 1.2.11
+VERSION_ZLIB		= 1.2.12
 
-- 
cgit v0.12