From 2b36e4dc813af8b2572be7d145e6b98457ded962 Mon Sep 17 00:00:00 2001
From: Hans-Peter Nilsson <hp@axis.com>
Date: Wed, 22 Jan 2020 05:39:31 +0100
Subject: [PATCH] config.gcc: Remove support for crisv32-*-* and cris-*-linux*.

Or really, move from the obsolete targets section, to
unsupported targets section, and remove crisv32-*-* and
cris-*-linux* from the rest.
Part of the removal of crisv32-* and cris-*-linux* (cris-elf remains).

gcc:
	* config.gcc: Remove support for crisv32-*-* and cris-*-linux*.
---
 gcc/ChangeLog  |  2 ++
 gcc/config.gcc | 28 ++--------------------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 39330ba0515..55591a7f0b2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,8 @@
 	* resource.c (init_resource_info): Filter-out TARGET_FLAGS_REGNUM
 	from end_of_function_needs.
 
+	* config.gcc: Remove support for crisv32-*-* and cris-*-linux*.
+
 2020-05-08  Vladimir Makarov  <vmakarov@redhat.com>
 
 	* ira-color.c (update_costs_from_allocno): Remove
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 113bc649f16..b7f16304712 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -248,8 +248,6 @@ md_file=
 # Obsolete configurations.
 case ${target} in
   tile*-*-*				\
- | crisv32-*-*				\
- | cris-*-linux*			\
  )
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration ${target} is obsolete." >&2
@@ -273,6 +271,8 @@ case ${target} in
  | arm*-*-elf				\
  | arm*-*-linux*			\
  | arm*-*-uclinux*			\
+ | cris-*-linux*			\
+ | crisv32-*-*				\
  | i[34567]86-go32-*			\
  | i[34567]86-*-go32*			\
  | m68k-*-uclinuxoldabi*		\
@@ -365,9 +365,6 @@ bfin*-*)
 bpf-*-*)
 	cpu_type=bpf
 	;;
-crisv32-*)
-	cpu_type=cris
-	;;
 frv*)	cpu_type=frv
 	extra_options="${extra_options} g.opt"
 	;;
@@ -1504,14 +1501,6 @@ cr16-*-elf)
         tmake_file="${tmake_file} cr16/t-cr16 "
         use_collect2=no
         ;;
-crisv32-*-elf | crisv32-*-none)
-	tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
-	tmake_file="cris/t-cris"
-	target_cpu_default=32
-	gas=yes
-	extra_options="${extra_options} cris/elf.opt"
-	use_gcc_stdint=wrap
-	;;
 cris-*-elf | cris-*-none)
 	tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
 	tmake_file="cris/t-cris cris/t-elfmulti"
@@ -1519,19 +1508,6 @@ cris-*-elf | cris-*-none)
 	extra_options="${extra_options} cris/elf.opt"
 	use_gcc_stdint=wrap
 	;;
-crisv32-*-linux* | cris-*-linux*)
-	tm_file="dbxelf.h elfos.h ${tm_file} gnu-user.h linux.h glibc-stdint.h cris/linux.h"
-	tmake_file="${tmake_file} cris/t-cris cris/t-linux"
-	extra_options="${extra_options} cris/linux.opt"
-	case $target in
-	  cris-*-*)
-		target_cpu_default=10
-		;;
-	  crisv32-*-*)
-		target_cpu_default=32
-		;;
-	esac
-	;;
 csky-*-*)
 	if test x${with_endian} != x; then
 	    case ${with_endian} in
-- 
2.30.2