From d27b3055bdb8d1698f7da5976ac2247db5aad213 Mon Sep 17 00:00:00 2001
From: Joerg Koening <jck@techsat.com>
Date: Thu, 28 Nov 2019 23:17:50 +0100
Subject: Update to newer version of gcc and binutils

Using GCC 9.2.0 and binutils 2.33.1
Removed gcc version from GCC install folder

Change-Id: I49761287ae03d320f8a67b20fb17b90079aaadd9
---
 Makefile        | 34 +++++++++++++++++++++-------------
 versions.mk.inc |  6 +++---
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 4ef411b..7226dc0 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ XGCC64			= "$(XGCC_BINPATH)/$(XGCC_PREFIX)gcc -m64 -static-libgcc"
 XGPP32			= "$(XGCC_BINPATH)/$(XGCC_PREFIX)g++ -m32 -static-libgcc -static-libstdc++"
 XGPP64			= "$(XGCC_BINPATH)/$(XGCC_PREFIX)g++ -m64 -static-libgcc -static-libstdc++"
 
-GCC_BINPATH		= $(INST_BASE)/gcc-$(VERSION_GCC)/bin
+GCC_BINPATH		= $(INST_BASE)/gcc/bin
 GCC32			= "$(GCC_BINPATH)/gcc -m32 -static-libgcc"
 GXX32			= "$(GCC_BINPATH)/g++ -m32 -static-libgcc -static-libstdc++"
 GCC64			= "$(GCC_BINPATH)/gcc -m32 -static-libgcc"
@@ -77,7 +77,7 @@ GCC			= "$(GCC_BINPATH)/gcc -static-libgcc"
 GXX			= "$(GCC_BINPATH)/g++ -static-libgcc -static-libstdc++"
 
 
-WINGCC_ROOTNAME		= gcc-$(VERSION_GCC)
+WINGCC_ROOTNAME		= gcc
 WINGCC_INST_DIR		= $(INST_BASE)/$(WINGCC_ROOTNAME)
 WINGCC_SYSROOT		= $(INST_BASE)/$(WINGCC_ROOTNAME)
 
@@ -204,9 +204,10 @@ lingcc-all:
 lingcc-binutils:
 	mkdir -p $(BUILD_DIR)/binutils
 	cd $(BUILD_DIR)/binutils ;\
+		LDLAGS="-static-libgcc -static-libstdc++" \
 		$(UNPACK_DIR)/binutils-$(VERSION_BINUTILS)/configure \
 			--with-pkgversion=$(GCC_PKGVERSION) \
-			--prefix=$(INST_BASE)/gcc-$(VERSION_GCC) \
+			--prefix=$(INST_BASE)/gcc \
 			--disable-nls \
 			--enable-deterministic-archives \
 			--with-gcc \
@@ -220,9 +221,10 @@ lingcc-binutils:
 lingcc-gcc:
 	mkdir -p $(BUILD_DIR)/gcc
 	cd $(BUILD_DIR)/gcc && \
+	LDLAGS="-static-libgcc -static-libstdc++" \
 	$(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \
 		--with-pkgversion=$(GCC_PKGVERSION) \
-		--prefix=$(INST_BASE)/gcc-$(VERSION_GCC) \
+		--prefix=$(INST_BASE)/gcc \
 		--build=$(ARCH64) \
 		--host=$(ARCH64) \
 		--target=$(ARCH64) \
@@ -256,31 +258,31 @@ lingcc-gcc:
 	make $(JOBS) install-strip
 
 lingcc-finish:
-	for f in `find $(INST_BASE)/gcc-$(VERSION_GCC) -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary' | cut -d: -f1`; do \
+	for f in `find $(INST_BASE)/gcc -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary' | cut -d: -f1`; do \
 			strip $$f ;\
 	done;
-	rm -Rf $(INST_BASE)/gcc-$(VERSION_GCC)/share
-	find $(INST_BASE)/gcc-$(VERSION_GCC) -type f -name "*.py" | xargs rm -f
+	rm -Rf $(INST_BASE)/gcc/share
+	find $(INST_BASE)/gcc -type f -name "*.py" | xargs rm -f
 
 lingcc-gdb: 
 	rm -Rf $(BUILD_DIR)/lingdb 
 	mkdir -p $(BUILD_DIR)/lingdb
 	cd $(BUILD_DIR)/lingdb && \
-	export PATH=$(INST_BASE)/gcc-$(VERSION_GCC)/bin:$(PATH) && \
+	export PATH=$(INST_BASE)/gcc/bin:$(PATH) && \
 	CFLAGS="-g -O2" \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	CXXFLAGS="-g -O2 -fpermissive" \
 	$(UNPACK_DIR)/gdb-$(VERSION_GDB)/configure \
-		--prefix=$(INST_BASE)/gcc-$(VERSION_GCC) \
+		--prefix=$(INST_BASE)/gcc \
 		--target=$(ARCH64) \
 		--host=$(ARCH64) \
 		--build=$(ARCH64) && \
 	make $(JOBS) && make $(JOBS) install
 
 lingcc-pack:
-	rm -Rf  $(INST_BASE)/gcc$(VERSION_GCC)/share
+	rm -Rf  $(INST_BASE)/gcc/share
 	cd $(INST_BASE) && \
-		tar -zcf $(PWD)/gcc-suite-$(VERSION_SUITE)-gcc-$(VERSION_GCC)-x86-linux64.tgz ./gcc-$(VERSION_GCC)
+		tar -zcf $(PWD)/gcc-suite-$(VERSION_SUITE)-gcc-$(VERSION_GCC)-x86-linux64.tgz ./gcc
 		
 
 ##############################################################################
@@ -472,7 +474,7 @@ xgcc-finish:
 xgcc-gdb: 
 	rm -rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb
 	cd $(BUILD_DIR)/gdb && \
-	export PATH=$(XGCC_BINPATH):$(INST_BASE)/gcc-$(VERSION_GCC)/bin:$(PATH) && \
+	export PATH=$(XGCC_BINPATH):$(INST_BASE)/gcc/bin:$(PATH) && \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	CFLAGS="-O2 -pipe" \
 	CXXFLAGS="-O2 -pipe -fpermissive" \
@@ -610,6 +612,7 @@ wingcc-binutils:
 	cd $(BUILD_DIR)/binutils ;\
 	    export PATH=$(XGCC_BINPATH):$(PATH) && \
 		CC=$(XGCC64) CXX=$(XGPP64) \
+		LDLAGS="-static-libgcc -static-libstdc++" \
 		$(UNPACK_DIR)/binutils-$(VERSION_BINUTILS)/configure \
 			--with-pkgversion=$(GCC_PKGVERSION) \
 			--prefix=$(WINGCC_INST_DIR) \
@@ -631,6 +634,7 @@ wingcc-mingw:
 	cd $(BUILD_DIR)/mingw && \
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC64) CXX=$(XGPP64) \
+	LDLAGS="-static-libgcc -static-libstdc++" \
 	$(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/configure \
 		--prefix=$(WINGCC_INST_DIR)/$(XGCC_TARGET64) \
 		--host=$(XGCC_TARGET64) \
@@ -669,6 +673,7 @@ wingcc-pthread-64:
 	rm -Rf $(BUILD_DIR)/winpthreads-64 && mkdir -p $(BUILD_DIR)/winpthreads-64
 	cd $(BUILD_DIR)/winpthreads-64 && \
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
+	LDLAGS="-static-libgcc -static-libstdc++" \
 	CC=$(XGCC64) CXX=$(XGPP64) \
 	$(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-libraries/winpthreads/configure \
 		--prefix=$(WINGCC_INST_DIR)/$(XGCC_TARGET64) \
@@ -683,6 +688,7 @@ wingcc-gcc:
 	cd $(BUILD_DIR)/gcc && \
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC64) CXX=$(XGPP64) \
+	LDLAGS="-static-libgcc -static-libstdc++" \
 	$(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \
 		--with-pkgversion=$(GCC_PKGVERSION) \
 		--prefix=$(WINGCC_INST_DIR) \
@@ -724,6 +730,7 @@ wingcc-finish:
 	find $(WINGCC_INST_DIR) -type f -name "*.py" | xargs rm -f
 	cd $(WINGCC_INST_DIR) && rm -Rf share 
 	cd $(WINGCC_INST_DIR) && rm -f mingw 
+	# x86_64-w64-mingw32-gdb-add-index.exe is a script and causes strip to fail
 	cd $(WINGCC_INST_DIR) ;\
 		find . -type f -name "*.exe" | xargs $(XGCC_BINPATH)/$(XGCC_PREFIX)strip
 	#
@@ -763,6 +770,7 @@ wingcc-gmake:
 	tar -jxf $(SOURCE_DIR)/make-4.2.tar.bz2
 	cd $(BUILD_DIR)/make-4.2 && \
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
+	LDLAGS="-static-libgcc -static-libstdc++" \
 	CC=$(XGCC64) CXX=$(XGPP64) \
 		./configure \
 			CFLAGS="-I../glob" \
@@ -893,7 +901,7 @@ wingcc-bzip2:
 wingcc-gdb: 
 	rm -Rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb
 	cd $(BUILD_DIR)/gdb && \
-	export PATH=$(XGCC_BINPATH):$(INST_BASE)/gcc-$(VERSION_GCC)/bin:$(PATH) && \
+	export PATH=$(XGCC_BINPATH):$(INST_BASE)/gcc/bin:$(PATH) && \
 	CC=$(XGCC64) CXX=$(XGPP64) \
 	CXXFLAGS="-g -O2 -fpermissive" \
 	CFLAGS="-g -O2" \
diff --git a/versions.mk.inc b/versions.mk.inc
index 4b2b3ac..bf2b2c0 100644
--- a/versions.mk.inc
+++ b/versions.mk.inc
@@ -1,7 +1,7 @@
-SUITE			= 1.4.0
+SUITE			= 1.5.0
 
-VERSION_BINUTILS	= 2.32
-VERSION_GCC		= 9.1.0
+VERSION_BINUTILS	= 2.33.1
+VERSION_GCC		= 9.2.0
 VERSION_MINGW		= 6.0.0
 VERSION_GMP		= 6.1.2
 VERSION_MPC		= 1.1.0
-- 
cgit v0.12