From 017586474a622f13b010ced06d2f405b8217e260 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 8 May 2019 04:04:18 +0100
Subject: [PATCH] gcc: Update to 9.1.0

This patch also removes libmpx which has been removed from GCC.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 gcc/gcc.nm | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index 5266c2f80..64831ef3a 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -7,7 +7,7 @@
 build_graphite = 1
 
 name       = gcc
-version    = 8.3.0
+version    = 9.1.0
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
@@ -64,9 +64,6 @@ build
 	# Build libubsan
 	build_libubsan = 0
 
-	# Build libmpx (only on x86_64)
-	build_libmpx = 0
-
 	# A couple of configure arguments depending on the architecture and
 	# configuration.
 	configure_options =
@@ -80,7 +77,6 @@ build
 		build_liblsan = 1
 		build_libtsan = 1
 		build_libubsan = 1
-		build_libmpx = 1
 	end
 
 	if "%{DISTRO_ARCH}" == "i686"
@@ -282,7 +278,7 @@ build
 		chmod 755 %{BUILDROOT}%{libdir}/libgomp.so.1.*
 
 		# libstdc++
-		ln -svf ../../../libstdc++.so.6.0.25 ${FULLPATH}/libstdc++.so
+		ln -svf ../../../libstdc++.so.6.0.26 ${FULLPATH}/libstdc++.so
 		mv -vf %{BUILDROOT}%{libdir}/lib{std,sup}c++.a ${FULLPATH}
 
 		# libquadmath
@@ -313,11 +309,6 @@ build
 			ln -svf ../../../libubsan.so.1.0.0 ${FULLPATH}/libubsan.so
 			chmod 755 %{BUILDROOT}%{libdir}/libubsan.so.*
 		fi
-
-		if [ "%{build_libmpx}" = "1" ]; then
-			ln -svf ../../../libmpx.so.2.0.1 ${FULLPATH}/libmpx.so
-			ln -svf ../../../libmpxwrappers.so.2.0.1 ${FULLPATH}/libmpxwrappers.so
-		fi
 	end
 
 	keep_libraries
@@ -612,22 +603,6 @@ packages
 		end
 	end
 
-	if "%{build_libmpx}" == "1"
-		package libmpx
-			summary = The Memory Protection Extensions runtime libraries
-			description
-				This package contains the Memory Protection Extensions
-				runtime libraries which is used for -fcheck-pointer-bounds
-				-mmpx instrumented programs.
-			end
-
-			files
-				%{libdir}/libmpx.so.*
-				%{libdir}/libmpxwrappers.so.*
-			end
-		end
-	end
-
 	package gcc-plugin-devel
 		summary = Support for compiling GCC plugins.
 		description