From 93d9a2ebd84052bf2afe42289696023d63676b3b Mon Sep 17 00:00:00 2001
From: Stan Cox <scox@cygnus.com>
Date: Fri, 13 Nov 1998 11:40:49 +0000
Subject: [PATCH] splet.h (SUBTARGET_OVERRIDE_OPTIONS): New to deprecate

* splet.h (SUBTARGET_OVERRIDE_OPTIONS): New to deprecate
* t-splet (MULTILIB_OPTIONS): Likewise.

From-SVN: r23636
---
 gcc/ChangeLog            |  4 ++++
 gcc/config/sparc/splet.h | 16 ++++++++++++++++
 gcc/config/sparc/t-splet |  5 ++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f627228..6245a34 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 Fri Nov 13 11:02:11 1998  Stan Cox  <scox@cygnus.com>
 
+	* splet.h (SUBTARGET_OVERRIDE_OPTIONS): New to
+	deprecate -mlive-g0 and -mbroken-saverestore.
+	* t-splet (MULTILIB_OPTIONS): Likewise.
+	
 	* sparc.c (sparc_flat_compute_frame_size): Correctly calc args_size
 	in a leaf function.  Clarify total_size/extra_size relationship.
 
diff --git a/gcc/config/sparc/splet.h b/gcc/config/sparc/splet.h
index 23c6414..50dbb58 100644
--- a/gcc/config/sparc/splet.h
+++ b/gcc/config/sparc/splet.h
@@ -51,3 +51,19 @@ Boston, MA 02111-1307, USA.  */
 #define BYTES_BIG_ENDIAN (! TARGET_LITTLE_ENDIAN)
 #undef WORDS_BIG_ENDIAN
 #define WORDS_BIG_ENDIAN (! TARGET_LITTLE_ENDIAN)
+
+#undef SUBTARGET_OVERRIDE_OPTIONS
+#define SUBTARGET_OVERRIDE_OPTIONS 					\
+  do {									\
+    if (TARGET_LIVE_G0)							\
+      {									\
+	warning ("Option '-mlive-g0' deprecated.");			\
+        target_flags &= ~MASK_LIVE_G0;					\
+      }									\
+    else if (TARGET_BROKEN_SAVERESTORE)					\
+      {									\
+	warning ("Option '-mbroken-saverestore' deprecated.");		\
+        target_flags &= ~MASK_BROKEN_SAVERESTORE;			\
+      }									\
+  } while (0)
+
diff --git a/gcc/config/sparc/t-splet b/gcc/config/sparc/t-splet
index 3409f5d..3329e0b 100644
--- a/gcc/config/sparc/t-splet
+++ b/gcc/config/sparc/t-splet
@@ -16,8 +16,7 @@ fp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT' > fp-bit.c
 	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
 
-MULTILIB_OPTIONS = mlittle-endian mlive-g0 mbroken-saverestore
-MULTILIB_DIRNAMES = little live-g0 brknsave
-
+MULTILIB_OPTIONS = mlittle-endian mflat
+MULTILIB_DIRNAMES = little flat
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib
-- 
2.7.4