diff --git a/gas/ChangeLog b/gas/ChangeLog
index fd5fface0c..e9bbbc7ba3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-15  Ian Lance Taylor  <ian@zembu.com>
+
+	* dwarf2dbg.c (dwarf2_gen_line_info): Don't assume that long long
+	or %llx work.
+
 Thu Jul 15 02:45:30 1999  Jeffrey A Law  (law@cygnus.com)
 
 	* config/tc-hppa.c (md_pseudo_table): Add ".dword" pseudo-op.
diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index a1489721e3..5e447abbb7 100644
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -409,8 +409,8 @@ dwarf2_gen_line_info (addr, l)
   segT saved_seg;
 
   if (flag_debug)
-    fprintf (stderr, "line: addr %llx file `%s' line %u col %u flags %x\n",
-	     (long long) addr, l->filename, l->line, l->column, l->flags);
+    fprintf (stderr, "line: addr %lx file `%s' line %u col %u flags %x\n",
+	     (unsigned long) addr, l->filename, l->line, l->column, l->flags);
 
   if (filenum > 0 && !l->filename)
     {