Remove remaining "%ll" uses.

	* go32-nat.c (go32_pte_for_address): Replace "0x%llx" using
	hex_string call.
	* rs6000-nat.c (rs6000_ptrace64): Idem.
	* solib-pa64.c (pa64_current_sos): Idem.
	* solib-spu.c (spu_current_sos): Idem.
	* linux-nat.c (linux_nat_find_memory_regions): Replace "%lld" using
	plongest call.
	* nto-procfs.c (procfs_meminfo): Replace "0x%016llx" using
	phex (VAR, 8) call.
	* sh64-tdep.c (sh64_show_media_regs): Idem.

8 files changed, 47 insertions, 32 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 46b161e073a..43743d14701 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2010-04-06  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	Remove remaining "%ll" uses.
+	* go32-nat.c (go32_pte_for_address): Replace "0x%llx" using
+	hex_string call.
+	* rs6000-nat.c (rs6000_ptrace64): Idem.
+	* solib-pa64.c (pa64_current_sos): Idem.
+	* solib-spu.c (spu_current_sos): Idem.
+	* linux-nat.c (linux_nat_find_memory_regions): Replace "%lld" using
+	plongest call.
+	* nto-procfs.c (procfs_meminfo): Replace "0x%016llx" using
+	phex (VAR, 8) call.
+	* sh64-tdep.c (sh64_show_media_regs): Idem.
+
 2010-04-05  Stan Shebs  <stan@codesourcery.com>
 
 	* tracepoint.c: Include gdbcore.h.
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index 5b0c98575c6..0345e5618b7 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -2047,8 +2047,8 @@ go32_pte_for_address (char *arg, int from_tty)
       int pte_idx = (addr >> 12) & 0x3ff;
       unsigned offs = addr & 0xfff;
 
-      printf_filtered ("Page Table entry for address 0x%llx:\n",
-		       (unsigned long long)addr);
+      printf_filtered ("Page Table entry for address %s:\n",
+		       hex_string(addr));
       display_ptable_entry (get_pte (get_pde (pde_idx), pte_idx), 0, 1, offs);
     }
 }
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 3afe9dd2128..e7e001bc4d5 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -4086,8 +4086,8 @@ linux_nat_find_memory_regions (int (*func) (CORE_ADDR,
       if (info_verbose)
 	{
 	  fprintf_filtered (gdb_stdout,
-			    "Save segment, %lld bytes at %s (%c%c%c)",
-			    size, paddress (target_gdbarch, addr),
+			    "Save segment, %s bytes at %s (%c%c%c)",
+			    plongest (size), paddress (target_gdbarch, addr),
 			    read ? 'r' : ' ',
 			    write ? 'w' : ' ', exec ? 'x' : ' ');
 	  if (filename[0])
diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c
index 3d62ff8a87f..2741ecfac12 100644
--- a/gdb/nto-procfs.c
+++ b/gdb/nto-procfs.c
@@ -577,14 +577,14 @@ procfs_meminfo (char *args, int from_tty)
 		       printme.text.addr);
       printf_filtered ("\t\tflags=%08x\n", printme.text.flags);
       printf_filtered ("\t\tdebug=%08x\n", printme.text.debug_vaddr);
-      printf_filtered ("\t\toffset=%016llx\n", printme.text.offset);
+      printf_filtered ("\t\toffset=%s\n", phex (printme.text.offset, 8));
       if (printme.data.size)
 	{
 	  printf_filtered ("\tdata=%08x bytes @ 0x%08x\n", printme.data.size,
 			   printme.data.addr);
 	  printf_filtered ("\t\tflags=%08x\n", printme.data.flags);
 	  printf_filtered ("\t\tdebug=%08x\n", printme.data.debug_vaddr);
-	  printf_filtered ("\t\toffset=%016llx\n", printme.data.offset);
+	  printf_filtered ("\t\toffset=%s\n", phex (printme.data.offset, 8));
 	}
       printf_filtered ("\tdev=0x%x\n", printme.dev);
       printf_filtered ("\tino=0x%x\n", (unsigned int) printme.ino);
diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c
index fb17d3154a2..fbdbdb233c0 100644
--- a/gdb/rs6000-nat.c
+++ b/gdb/rs6000-nat.c
@@ -200,8 +200,8 @@ rs6000_ptrace64 (int req, int id, long long addr, int data, void *buf)
   int ret = 0;
 #endif
 #if 0
-  printf ("rs6000_ptrace64 (%d, %d, 0x%llx, %08x, 0x%x) = 0x%x\n",
-	  req, id, addr, data, (unsigned int)buf, ret);
+  printf ("rs6000_ptrace64 (%d, %d, %s, %08x, 0x%x) = 0x%x\n",
+	  req, id, hex_string (addr), data, (unsigned int)buf, ret);
 #endif
   return ret;
 }
diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c
index 5b70732408a..8d7782a7bbc 100644
--- a/gdb/sh64-tdep.c
+++ b/gdb/sh64-tdep.c
@@ -1330,27 +1330,27 @@ sh64_show_media_regs (struct frame_info *frame)
   int i;
 
   printf_filtered
-    ("PC=%s SR=%016llx \n",
+    ("PC=%s SR=%s \n",
      phex (get_frame_register_unsigned (frame,
 					gdbarch_pc_regnum (gdbarch)), 8),
-     (long long) get_frame_register_unsigned (frame, SR_REGNUM));
+     phex (get_frame_register_unsigned (frame, SR_REGNUM), 8));
 
   printf_filtered
-    ("SSR=%016llx SPC=%016llx \n",
-     (long long) get_frame_register_unsigned (frame, SSR_REGNUM),
-     (long long) get_frame_register_unsigned (frame, SPC_REGNUM));
+    ("SSR=%s SPC=%s \n",
+     phex (get_frame_register_unsigned (frame, SSR_REGNUM), 8),
+     phex (get_frame_register_unsigned (frame, SPC_REGNUM), 8));
   printf_filtered
-    ("FPSCR=%016lx\n ",
-     (long) get_frame_register_unsigned (frame, FPSCR_REGNUM));
+    ("FPSCR=%s\n ",
+     phex (get_frame_register_unsigned (frame, FPSCR_REGNUM), 8));
 
   for (i = 0; i < 64; i = i + 4)
     printf_filtered
-      ("\nR%d-R%d  %016llx %016llx %016llx %016llx\n",
+      ("\nR%d-R%d  %s %s %s %s\n",
        i, i + 3,
-      (long long) get_frame_register_unsigned (frame, i + 0),
-      (long long) get_frame_register_unsigned (frame, i + 1),
-      (long long) get_frame_register_unsigned (frame, i + 2),
-      (long long) get_frame_register_unsigned (frame, i + 3));
+      phex (get_frame_register_unsigned (frame, i + 0), 8),
+      phex (get_frame_register_unsigned (frame, i + 1), 8),
+      phex (get_frame_register_unsigned (frame, i + 2), 8),
+      phex (get_frame_register_unsigned (frame, i + 3), 8));
 
   printf_filtered ("\n");
   
diff --git a/gdb/solib-pa64.c b/gdb/solib-pa64.c
index 1643e4e5988..22478a3326c 100644
--- a/gdb/solib-pa64.c
+++ b/gdb/solib-pa64.c
@@ -493,17 +493,17 @@ pa64_current_sos (void)
         struct load_module_desc *d = &new->lm_info->desc;
 	printf ("\n+ library \"%s\" is described at index %d\n", new->so_name, 
 		dll_index);
-	printf ("    text_base = 0x%llx\n", d->text_base); 
-	printf ("    text_size = 0x%llx\n", d->text_size); 
-	printf ("    data_base = 0x%llx\n", d->data_base); 
-	printf ("    data_size = 0x%llx\n", d->data_size); 
-	printf ("    unwind_base = 0x%llx\n", d->unwind_base); 
-	printf ("    linkage_ptr = 0x%llx\n", d->linkage_ptr); 
-	printf ("    phdr_base = 0x%llx\n", d->phdr_base); 
-	printf ("    tls_size = 0x%llx\n", d->tls_size); 
-	printf ("    tls_start_addr = 0x%llx\n", d->tls_start_addr); 
-	printf ("    unwind_size = 0x%llx\n", d->unwind_size); 
-	printf ("    tls_index = 0x%llx\n", d->tls_index); 
+	printf ("    text_base = %s\n", hex_string (d->text_base));
+	printf ("    text_size = %s\n", hex_string (d->text_size));
+	printf ("    data_base = %s\n", hex_string (d->data_base));
+	printf ("    data_size = %s\n", hex_string (d->data_size));
+	printf ("    unwind_base = %s\n", hex_string (d->unwind_base));
+	printf ("    linkage_ptr = %s\n", hex_string (d->linkage_ptr));
+	printf ("    phdr_base = %s\n", hex_string (d->phdr_base));
+	printf ("    tls_size = %s\n", hex_string (d->tls_size));
+	printf ("    tls_start_addr = %s\n", hex_string (d->tls_start_addr));
+	printf ("    unwind_size = %s\n", hex_string (d->unwind_size));
+	printf ("    tls_index = %s\n", hex_string (d->tls_index));
       }
 #endif
 
diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c
index fb17d2c775d..342a02208f9 100644
--- a/gdb/solib-spu.c
+++ b/gdb/solib-spu.c
@@ -161,7 +161,8 @@ spu_current_sos (void)
 
       /* Encode FD and object ID in path name.  Choose the name so as not
 	 to conflict with any (normal) SVR4 library path name.  */
-      xsnprintf (new->so_name, sizeof new->so_name, "@0x%llx <%d>", addr, fd);
+      xsnprintf (new->so_name, sizeof new->so_name, "@%s <%d>",
+		 hex_string (addr), fd);
       strcpy (new->so_original_name, new->so_name);
 
       *link_ptr = new;