diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fb767fd920..738ed615b9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 11 17:50:31 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* symtab.c: Use paddr_nz() to print addresses.
+
 Tue Jul 11 12:52:31 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* value.h (read_register, read_signed_register): Change return
diff --git a/gdb/symtab.c b/gdb/symtab.c
index fd9c150aff..4e15cbcb35 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -1472,10 +1472,9 @@ find_pc_sect_symtab (pc, section)
 	/* Might want to error() here (in case symtab is corrupt and
 	   will cause a core dump), but maybe we can successfully
 	   continue, so let's not.  */
-	/* FIXME-32x64: assumes pc fits in a long */
 	warning ("\
-(Internal error: pc 0x%lx in read in psymtab, but not in symtab.)\n",
-		 (unsigned long) pc);
+(Internal error: pc 0x%s in read in psymtab, but not in symtab.)\n",
+		 paddr_nz (pc));
       s = PSYMTAB_TO_SYMTAB (ps);
     }
   return (s);