From: DJ Delorie <dj@redhat.com>
Date: Tue, 19 May 2009 23:31:33 +0000 (+0000)
Subject: * config/tc-mep.c (mep_machine): Only check CPU flags, not COP flags.
X-Git-Tag: sid-snapshot-20090601~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b899d3323df558fe8ffdc393c7af72e66d9621ac;p=thirdparty%2Fbinutils-gdb.git

* config/tc-mep.c (mep_machine): Only check CPU flags, not COP flags.
(mep_process_saved_insns): Remove debugging printfs.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7f4fd567e31..d9af8b447c2 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-19  DJ Delorie  <dj@redhat.com>
+
+	* config/tc-mep.c (mep_machine): Only check CPU flags, not COP flags.
+	(mep_process_saved_insns): Remove debugging printfs.
+
 2009-05-19  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* NEWS:  Mention new feature.
diff --git a/gas/config/tc-mep.c b/gas/config/tc-mep.c
index 6ad68774122..338fdbfbb56 100644
--- a/gas/config/tc-mep.c
+++ b/gas/config/tc-mep.c
@@ -413,7 +413,7 @@ mep_check_for_disabled_registers (mep_insn *insn)
 static int
 mep_machine (void)
 {
-  switch (MEP_CPU)
+  switch (MEP_CPU & EF_MEP_CPU_MASK)
     {
     default: break;
     case EF_MEP_CPU_C2: return bfd_mach_mep;
@@ -1144,7 +1144,6 @@ static void
 mep_process_saved_insns (void)
 {
   int i;
-  unsigned j;
 
   gas_cgen_save_fixups (MAX_SAVED_FIXUP_CHAINS - 1);
 
@@ -1164,10 +1163,6 @@ mep_process_saved_insns (void)
 	  gas_cgen_finish_insn (saved_insns[i].insn, saved_insns[i].buffer,
 				CGEN_FIELDS_BITSIZE (& saved_insns[i].fields),
 				1, NULL);
-	  printf("insn[%d] =", i);
-	  for (j=0; j<sizeof(saved_insns[i].buffer); j++)
-	    printf(" %02x", saved_insns[i].buffer[j]);
-	  printf("\n");
 	}
     }
   gas_cgen_restore_fixups (MAX_SAVED_FIXUP_CHAINS - 1);