xtensa_pseudo_register_read/write - Use regcache_raw_read_unsigned

[deliverable/binutils-gdb.git] / gdb / i386-darwin-tdep.c

diff --git a/gdb/i386-darwin-tdep.c b/gdb/i386-darwin-tdep.c
index e0090ef0ab0ae987852c133f6bda67fa6e4e866f..0c558ccf5610d69d20c64643b70ff1eefaf664e2 100644 (file)
--- a/gdb/i386-darwin-tdep.c
+++ b/gdb/i386-darwin-tdep.c
@@ -1,5 +1,5 @@
 /* Darwin support for GDB, the GNU debugger.
-   Copyright (C) 1997-2016 Free Software Foundation, Inc.
+   Copyright (C) 1997-2017 Free Software Foundation, Inc.
 
    Contributed by Apple Computer, Inc.
 
@@ -36,6 +36,7 @@
 #include "solib.h"
 #include "solib-darwin.h"
 #include "dwarf2-frame.h"
+#include <algorithm>
 
 /* Offsets into the struct i386_thread_state where we'll find the saved regs.
    From <mach/i386/thread_status.h> and i386-tdep.h.  */
@@ -137,8 +138,12 @@ i386_darwin_arg_type_alignment (struct type *type)
       int i;
       int res = 4;
       for (i = 0; i < TYPE_NFIELDS (type); i++)
-        res = max (res,
-                   i386_darwin_arg_type_alignment (TYPE_FIELD_TYPE (type, i)));
+       {
+         int align
+           = i386_darwin_arg_type_alignment (TYPE_FIELD_TYPE (type, i));
+
+         res = std::max (res, align);
+       }
       return res;
     }
   /* 2.  The caller aligns nonvector arguments to 4-byte boundaries.  */