From 39748a89976d0fd0f75bda58fbae033b45df8c2f Mon Sep 17 00:00:00 2001
From: Hans-Peter Nilsson <hp@axis.com>
Date: Wed, 22 Jan 2020 05:44:32 +0100
Subject: [PATCH] libgcc: cris: Remove support for crisv32-*-* and
 cris*-*-linux

Part of the removal of crisv32-* and cris-*-linux* (cris-elf remains).

libgcc:
	* config.host: Remove support for crisv32-*-* and cris*-*-linux.
	* config/cris/libgcc-glibc.ver, config/cris/t-linux: Remove.
---
 libgcc/ChangeLog                    | 5 +++++
 libgcc/config.host                  | 9 ---------
 libgcc/config/cris/libgcc-glibc.ver | 7 -------
 libgcc/config/cris/t-linux          | 2 --
 4 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 libgcc/config/cris/libgcc-glibc.ver
 delete mode 100644 libgcc/config/cris/t-linux

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 33e8929f16a..8ae4c7f886f 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-09  Hans-Peter Nilsson  <hp@axis.com>
+
+	* config.host: Remove support for crisv32-*-* and cris*-*-linux.
+	* config/cris/libgcc-glibc.ver, config/cris/t-linux: Remove.
+
 2020-05-06  Uroš Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/sfp-exceptions.c (__math_force_eval): Remove.
diff --git a/libgcc/config.host b/libgcc/config.host
index 1ff41592337..2cd42097167 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -112,9 +112,6 @@ bpf-*-*)
         ;;
 cr16-*-*)
 	;;
-crisv32-*-*)
-	cpu_type=cris
-	;;
 csky*-*-*)
 	cpu_type=csky
 	;;
@@ -577,15 +574,9 @@ cr16-*-elf)
 	tmake_file="${tmake_file} cr16/t-cr16 cr16/t-crtlibid t-fdpbit"
 	extra_parts="$extra_parts crti.o crtn.o crtlibid.o"
         ;;
-crisv32-*-elf)
-	tmake_file="$tmake_file cris/t-cris t-softfp-sfdf t-softfp"
- 	;;
 cris-*-elf)
 	tmake_file="$tmake_file cris/t-cris t-softfp-sfdf t-softfp cris/t-elfmulti"
 	;;
-cris-*-linux* | crisv32-*-linux*)
-	tmake_file="$tmake_file cris/t-cris t-softfp-sfdf t-softfp cris/t-linux"
-	;;
 csky-*-elf*)
 	tmake_file="csky/t-csky t-fdpbit"
 	extra_parts="$extra_parts crti.o crtn.o"
diff --git a/libgcc/config/cris/libgcc-glibc.ver b/libgcc/config/cris/libgcc-glibc.ver
deleted file mode 100644
index e35de83100f..00000000000
--- a/libgcc/config/cris/libgcc-glibc.ver
+++ /dev/null
@@ -1,7 +0,0 @@
-GCC_4.3 {
- __Mul
- __Div
- __Udiv
- __Mod
- __Umod
-}
diff --git a/libgcc/config/cris/t-linux b/libgcc/config/cris/t-linux
deleted file mode 100644
index 8c7f4d44249..00000000000
--- a/libgcc/config/cris/t-linux
+++ /dev/null
@@ -1,2 +0,0 @@
-# Override t-linux default.
-SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/cris/libgcc-glibc.ver
-- 
2.30.2