Ravenscar port for RISC-V

[deliverable/binutils-gdb.git] / gdb / frv-tdep.c

diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index 9c00f96c19048f4aa8dc3c552020c377930a481a..a80c0437cb64a42107a93621f082a84dd832e01c 100644 (file)
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -18,28 +18,26 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "../opcodes/frv-desc.h"
+#include "inferior.h"
+#include "gdbcore.h"
 #include "arch-utils.h"
+#include "regcache.h"
+#include "frame.h"
+#include "frame-unwind.h"
+#include "frame-base.h"
+#include "trad-frame.h"
 #include "dis-asm.h"
+#include "sim-regno.h"
+#include "gdb/sim-frv.h"
+#include "opcodes/frv-desc.h"  /* for the H_SPR_... enums */
+#include "symtab.h"
 #include "elf-bfd.h"
 #include "elf/frv.h"
-#include "frame-base.h"
-#include "frame-unwind.h"
-#include "frame.h"
-#include "frv-tdep.h"
-#include "gdb/sim-frv.h"
-#include "gdbcore.h"
-#include "infcall.h"
-#include "inferior.h"
-#include "objfiles.h"
 #include "osabi.h"
-#include "regcache.h"
-#include "sim-regno.h"
+#include "infcall.h"
 #include "solib.h"
-#include "symtab.h"
-#include "trad-frame.h"
+#include "frv-tdep.h"
+#include "objfiles.h"
 
 struct frv_unwind_cache                /* was struct frame_extra_info */
   {
@@ -526,7 +524,7 @@ frv_analyze_prologue (struct gdbarch *gdbarch, CORE_ADDR pc,
      J - The register number of GRj in the instruction description.
      K - The register number of GRk in the instruction description.
      I - The register number of GRi.
-     S - a signed imediate offset.
+     S - a signed immediate offset.
      U - an unsigned immediate offset.
 
      The dots below the numbers indicate where hex digit boundaries
@@ -1076,8 +1074,8 @@ frv_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
       s = lookup_minimal_symbol_by_pc (call_dest);
 
       if (s.minsym != NULL
-          && MSYMBOL_LINKAGE_NAME (s.minsym) != NULL
-         && strcmp (MSYMBOL_LINKAGE_NAME (s.minsym), "__main") == 0)
+          && s.minsym->linkage_name () != NULL
+         && strcmp (s.minsym->linkage_name (), "__main") == 0)
        {
          pc += 4;
          return pc;