Fix 32-bit host/target --enable-targets=all build failure from Doug Evans.

* ia64-gen.c (_opcode_int64_low, _opcode_int64_high,
opcode_fprintf_vma): New.
(print_main_table): New opcode_fprintf_vma instead of fprintf_vma.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 83dee04dfd548345978b9d9cae6f845b42408450..e68bab58423a7629e244cd21fedf7954b83bd7e8 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-22  James E Wilson  <wilson@specifix.com>
+
+       * ia64-gen.c (_opcode_int64_low, _opcode_int64_high,
+       opcode_fprintf_vma): New.
+       (print_main_table): New opcode_fprintf_vma instead of fprintf_vma.
+
 2005-11-16  Alan Modra  <amodra@bigpond.net.au>
 
        * ppc-opc.c (powerpc_opcodes): Add frin,friz,frip,frim.  Correct

diff --git a/opcodes/ia64-gen.c b/opcodes/ia64-gen.c
index e12c145bea142b758f4c9caf8cf6eb2033cc79ab..cb86e9404233d077fd818f9790c0c14cc3444be3 100644 (file)
--- a/opcodes/ia64-gen.c
+++ b/opcodes/ia64-gen.c
@@ -54,6 +54,15 @@
 #include <libintl.h>
 #define _(String) gettext (String)
 
+/* This is a copy of fprintf_vma from bfd/bfd-in2.h.  We have to use this
+   always, because we might be compiled without BFD64 defined, if configured
+   for a 32-bit target and --enable-targets=all is used.  This will work for
+   both 32-bit and 64-bit hosts.  */
+#define _opcode_int64_low(x) ((unsigned long) (((x) & 0xffffffff)))
+#define _opcode_int64_high(x) ((unsigned long) (((x) >> 32) & 0xffffffff))
+#define opcode_fprintf_vma(s,x) \
+  fprintf ((s), "%08lx%08lx", _opcode_int64_high (x), _opcode_int64_low (x))
+
 const char * program_name = NULL;
 int debug = 0;
 
@@ -2701,9 +2710,9 @@ print_main_table (void)
              ptr->name->num,
              ptr->opcode->type,
              ptr->opcode->num_outputs);
-      fprintf_vma (stdout, ptr->opcode->opcode);
+      opcode_fprintf_vma (stdout, ptr->opcode->opcode);
       printf ("ull, 0x");
-      fprintf_vma (stdout, ptr->opcode->mask);
+      opcode_fprintf_vma (stdout, ptr->opcode->mask);
       printf ("ull, { %d, %d, %d, %d, %d }, 0x%x, %d, },\n",
              ptr->opcode->operands[0],
              ptr->opcode->operands[1],