mep: Add cast for int to enum conversion

Taken directly from Pedro's branch.

gdb/ChangeLog:

	* mep-tdep.c (current_me_module): Add cast.
	(mep_gdbarch_init): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index acfddef815537b1c22b21964a33b8f478fd8f67e..64c4b4e931ede57b708ebd51fe8bcbfc8fe9c2d9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-12  Simon Marchi  <simon.marchi@polymtl.ca>
+
+       * mep-tdep.c (current_me_module): Add cast.
+       (mep_gdbarch_init): Likewise.
+
 2015-10-12  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * m32c-tdep.c (m32c_move_reg_t): Replace with...

diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index b6f242fb034cade297292e8333db3b5e7bed944c..f7d33ca92c76b98d2140283238587250086d321c 100644 (file)
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -848,7 +848,7 @@ current_me_module (void)
       ULONGEST regval;
       regcache_cooked_read_unsigned (get_current_regcache (),
                                     MEP_MODULE_REGNUM, &regval);
-      return regval;
+      return (CONFIG_ATTR) regval;
     }
   else
     return gdbarch_tdep (target_gdbarch ())->me_module;
@@ -2396,7 +2396,10 @@ mep_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
       /* The way to get the me_module code depends on the object file
          format.  At the moment, we only know how to handle ELF.  */
       if (bfd_get_flavour (info.abfd) == bfd_target_elf_flavour)
-        me_module = elf_elfheader (info.abfd)->e_flags & EF_MEP_INDEX_MASK;
+       {
+         int flag = elf_elfheader (info.abfd)->e_flags & EF_MEP_INDEX_MASK;
+         me_module = (CONFIG_ATTR) flag;
+       }
       else
         me_module = CONFIG_NONE;
     }