From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Mon, 12 Oct 2015 16:43:23 +0000 (-0400)
Subject: mep: Add cast for int to enum conversion
X-Git-Tag: users/ARM/embedded-binutils-2_26-branch-2016q1~445
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f54b226fb0c350b98a9d7afb09d84564089a5bed;p=platform%2Fupstream%2Fbinutils.git

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 acfddef..64c4b4e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 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...
 	(m32c_write_reg_t): ...this and...
 	(m32c_read_reg_t): ...this.
diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index b6f242f..f7d33ca 100644
--- 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;
     }