From eae3f093625e013ce71cbf1a26e047b416c42b22 Mon Sep 17 00:00:00 2001
From: Jim Kingdon <jkingdon@engr.sgi.com>
Date: Mon, 28 Feb 1994 06:02:11 +0000
Subject: [PATCH] 	* i387-tdep.c, i386-tdep.c i386v-nat.c, i386aix-nat.c,
 	i386m3-nat.c, config/m68k/tm-m68k.h, i960-tdep.c 
 config/i960/tm-i960.h, remote-nindy.c, config/m88k/tm-m88k.h, 	m88k-tdep.c:
 Use floatformat.h instead of ieee-float.h. 	* sparc-tdep.c: Remove
 now-obsolete ieee-float.h stuff 	* findvar.c: Update comment regarding
 ieee-float.h.

---
 gdb/i386-tdep.c | 12 ++++++++----
 gdb/i386v-nat.c |  3 +--
 gdb/i387-tdep.c | 11 +++--------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index e6ee9ce0928..4b2471fa6fe 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -22,7 +22,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "inferior.h"
 #include "gdbcore.h"
 #include "target.h"
+<<<<<<< i386-tdep.c
+#include "floatformat.h"
+||||||| 1.26
+=======
 #include "symtab.h"
+>>>>>>> 1.27
 
 static long
 i386_get_frame_setup PARAMS ((int));
@@ -618,12 +623,11 @@ i386_extract_return_value(type, regbuf, valbuf)
 {
   if (TYPE_CODE_FLT == TYPE_CODE(type))
     {
-      extern struct ext_format ext_format_i387;
       double d;
       /* 387 %st(0), gcc uses this */
-      ieee_extended_to_double (&ext_format_i387,
-			       &regbuf[REGISTER_BYTE(FP0_REGNUM)],
-			       &d);
+      floatformat_to_double (&floatformat_i387_ext,
+			     &regbuf[REGISTER_BYTE(FP0_REGNUM)],
+			     &d);
       store_floating (valbuf, TYPE_LENGTH (type), d);
     }
   else
diff --git a/gdb/i386v-nat.c b/gdb/i386v-nat.c
index 3e16d319223..1a6213afeb0 100644
--- a/gdb/i386v-nat.c
+++ b/gdb/i386v-nat.c
@@ -41,11 +41,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/reg.h>
 #endif
 
-#include "ieee-float.h"
+#include "floatformat.h"
 
 #include "target.h"
 
-extern struct ext_format ext_format_i387;
 
 /* this table must line up with REGISTER_NAMES in tm-i386v.h */
 /* symbols like 'EAX' come from <sys/reg.h> */
diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c
index 1e5da17b5c9..3cec3abd1f2 100644
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -22,12 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "inferior.h"
 #include "language.h"
 #include "gdbcore.h"
-#include "ieee-float.h"
-
-struct ext_format ext_format_i387 = {
-/* tot sbyte smask expbyte	manbyte */
-   10, 9,    0x80, 9,8,		4,0		/* i387 */
-};
+#include "floatformat.h"
 
 /* FIXME:  Eliminate these routines when we have the time to change all
    the callers.  */
@@ -37,7 +32,7 @@ i387_to_double (from, to)
      char *from;
      char *to;
 {
-  ieee_extended_to_double (&ext_format_i387, from, (double *)to);
+  floatformat_to_double (&floatformat_i387_ext, from, (double *)to);
 }
 
 void
@@ -45,7 +40,7 @@ double_to_i387 (from, to)
      char *from;
      char *to;
 {
-  double_to_ieee_extended (&ext_format_i387, (double *)from, to);
+  floatformat_from_double (&floatformat_i387_ext, (double *)from, to);
 }
 
 void
-- 
2.30.2