Add support for building on a 64-bit Windows host.

3 files changed, 28 insertions, 8 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index cd86a5d..d1a43a3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-12  Kai Tietz   <kai.tietz@onevision.com>
+
+	* symbols.c: Print bfd_hostptr_t to file via fprintf_vma.
+	* write.c: Likewise.
+
 2007-07-11  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* config/tc-mips.c (mips_dwarf2_format, mips_dwarf2_addr_size): Use
diff --git a/gas/symbols.c b/gas/symbols.c
index e8c7154..b631a1d 100644
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -2728,14 +2728,20 @@ print_symbol_value_1 (FILE *file, symbolS *sym)
   const char *name = S_GET_NAME (sym);
   if (!name || !name[0])
     name = "(unnamed)";
-  fprintf (file, "sym %lx %s", (unsigned long) sym, name);
+  fprintf (file, "sym ");
+  fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) sym));
+  fprintf (file, " %s", name);
 
   if (LOCAL_SYMBOL_CHECK (sym))
     {
       struct local_symbol *locsym = (struct local_symbol *) sym;
-      if (local_symbol_get_frag (locsym) != &zero_address_frag
+
+      if (local_symbol_get_frag (locsym) != & zero_address_frag
 	  && local_symbol_get_frag (locsym) != NULL)
-	fprintf (file, " frag %lx", (long) local_symbol_get_frag (locsym));
+	{
+	  fprintf (file, " frag ");
+	  fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) local_symbol_get_frag (locsym)));
+        }
       if (local_symbol_resolved_p (locsym))
 	fprintf (file, " resolved");
       fprintf (file, " local");
@@ -2743,7 +2749,10 @@ print_symbol_value_1 (FILE *file, symbolS *sym)
   else
     {
       if (sym->sy_frag != &zero_address_frag)
-	fprintf (file, " frag %lx", (long) sym->sy_frag);
+	{
+	  fprintf (file, " frag ");
+	  fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) sym->sy_frag));
+	}
       if (sym->written)
 	fprintf (file, " written");
       if (sym->sy_resolved)
@@ -2817,7 +2826,9 @@ print_binary (FILE *file, const char *name, expressionS *exp)
 void
 print_expr_1 (FILE *file, expressionS *exp)
 {
-  fprintf (file, "expr %lx ", (long) exp);
+  fprintf (file, "expr ");
+  fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) exp));
+  fprintf (file, " ");
   switch (exp->X_op)
     {
     case O_illegal:
diff --git a/gas/write.c b/gas/write.c
index 59a8dc3..03641df 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -2486,7 +2486,9 @@ void
 print_fixup (fixS *fixp)
 {
   indent_level = 1;
-  fprintf (stderr, "fix %lx %s:%d", (long) fixp, fixp->fx_file, fixp->fx_line);
+  fprintf (stderr, "fix ");
+  fprintf_vma (stderr, (bfd_vma)((bfd_hostptr_t) fixp));
+  fprintf (stderr, " %s:%d",fixp->fx_file, fixp->fx_line);
   if (fixp->fx_pcrel)
     fprintf (stderr, " pcrel");
   if (fixp->fx_pcrel_adjust)
@@ -2503,8 +2505,10 @@ print_fixup (fixS *fixp)
     fprintf (stderr, " tcbit");
   if (fixp->fx_done)
     fprintf (stderr, " done");
-  fprintf (stderr, "\n    size=%d frag=%lx where=%ld offset=%lx addnumber=%lx",
-	   fixp->fx_size, (long) fixp->fx_frag, (long) fixp->fx_where,
+  fprintf (stderr, "\n    size=%d frag=", fixp->fx_size);
+  fprintf_vma (stderr, (bfd_vma) ((bfd_hostptr_t) fixp->fx_frag));
+  fprintf (stderr, " where=%ld offset=%lx addnumber=%lx",
+	   (long) fixp->fx_where,
 	   (long) fixp->fx_offset, (long) fixp->fx_addnumber);
   fprintf (stderr, "\n    %s (%d)", bfd_get_reloc_code_name (fixp->fx_r_type),
 	   fixp->fx_r_type);