Remove IRIX 5 <sys/proc.h> _KMEMUSER workaround

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

diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index f904fad0404e52189d3d192daf465029606ec837..8e1d79e51286081eb8cbcbfefe26f4da9927cb33 100644 (file)
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -36,8 +36,8 @@
 #include "trad-frame.h"
 #include "dis-asm.h"
 #include "objfiles.h"
-
 #include "m32r-tdep.h"
+#include <algorithm>
 
 /* Local functions */
 
@@ -355,9 +355,7 @@ decode_prologue (struct gdbarch *gdbarch,
 
       if ((insn & 0xf0ff) == 0x207f)
        {                       /* st reg, @-sp */
-         int regno;
          framesize += 4;
-         regno = ((insn >> 8) & 0xf);
          after_prologue = 0;
          continue;
        }
@@ -486,7 +484,7 @@ m32r_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
           the end of the function.  In this case, there probably isn't a
           prologue.  */
        {
-         func_end = min (func_end, func_addr + DEFAULT_SEARCH_LIMIT);
+         func_end = std::min (func_end, func_addr + DEFAULT_SEARCH_LIMIT);
        }
     }
   else