aboutsummaryrefslogtreecommitdiff
path: root/gdb/i386-tdep.c
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/i386-tdep.c')
-rw-r--r--gdb/i386-tdep.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index e6ee9ce..4b2471f 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