From: Maciej W. Rozycki <macro@imgtec.com>
Date: Tue, 1 Aug 2017 18:32:25 +0000 (+0100)
Subject: MIPS: Consistently use MIPS_FPU_TYPE for `gdbarch' member
X-Git-Tag: hjl/gpoff-backup~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2f1f308535745e1e8b1896945cfe4ce0aae59e7;p=thirdparty%2Fbinutils-gdb.git

MIPS: Consistently use MIPS_FPU_TYPE for `gdbarch' member

Complement commit 74ed0bb4148e ("Replace current_gdbarch in *mips*"),
<https://sourceware.org/ml/gdb-patches/2008-06/msg00490.html>, and
consistently use the MIPS_FPU_TYPE macro to access the `->mips_fpu_type'
target-dependent `gdbarch' member.  No functional change.

	gdb/
	* mips-tdep.c (mips_gdbarch_init): Use MIPS_FPU_TYPE to access
	`->mips_fpu_type'.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dd66a45b895..90c6f5ff867 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-01  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* mips-tdep.c (mips_gdbarch_init): Use MIPS_FPU_TYPE to access
+	`->mips_fpu_type'.
+
 2017-07-31  Xavier Roirand  <roirand@adacore.com>
 
 	* solib-darwin.c (DYLD_VERSION_MAX): Increase value.
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index c1800e419f8..75d54d03687 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -8451,7 +8451,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 	break;
       }
   else if (arches != NULL)
-    fpu_type = gdbarch_tdep (arches->gdbarch)->mips_fpu_type;
+    fpu_type = MIPS_FPU_TYPE (arches->gdbarch);
   else
     fpu_type = MIPS_FPU_DOUBLE;
   if (gdbarch_debug)
@@ -8491,7 +8491,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 	  != mips64_transfers_32bit_regs_p)
 	continue;
       /* Be pedantic about which FPU is selected.  */
-      if (gdbarch_tdep (arches->gdbarch)->mips_fpu_type != fpu_type)
+      if (MIPS_FPU_TYPE (arches->gdbarch) != fpu_type)
 	continue;
 
       if (tdesc_data != NULL)