[SCM] jankratochvil/gdbserverbuildid: Merge branch 'common-mergehex-empty-moveprep-move-attrgen-validate' into common-mergehex-empty-moveprep-move-attrgen-validate-tests

[jkratoch@sourceware.org]

The branch, jankratochvil/gdbserverbuildid has been updated
       via  d151b54dd8143930a2b0a7da219e4ac337563d78 (commit)
       via  9c2bdf7b7069db180779aad4659e21e6e1c41abf (commit)
       via  999c3f45319a3d8156362e3341aa6c8584499a33 (commit)
       via  fc6c556b6a7087e87b41479875d6683d2420215a (commit)
       via  e41b043839e6720fba05a19131ecdc1d793372e5 (commit)
       via  80328be5757d7313cda73fc0c86e0711679449c2 (commit)
      from  ea11f1f08abbb9a19140ab33174803f224f25a78 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit d151b54dd8143930a2b0a7da219e4ac337563d78
Merge: ea11f1f 9c2bdf7
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Feb 25 22:25:01 2014 +0100

    Merge branch 'common-mergehex-empty-moveprep-move-attrgen-validate' into common-mergehex-empty-moveprep-move-attrgen-validate-tests

commit 9c2bdf7b7069db180779aad4659e21e6e1c41abf
Merge: bc529e5 999c3f4
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Feb 25 22:25:00 2014 +0100

    Merge branch 'common-mergehex-empty-moveprep-move-attrgen' into common-mergehex-empty-moveprep-move-attrgen-validate

commit 999c3f45319a3d8156362e3341aa6c8584499a33
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Feb 25 22:24:54 2014 +0100

    .

commit fc6c556b6a7087e87b41479875d6683d2420215a
Merge: 9c77c90 e41b043
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Feb 25 22:15:10 2014 +0100

    Merge branch 'common-mergehex-empty-moveprep-move' into common-mergehex-empty-moveprep-move-attrgen

commit e41b043839e6720fba05a19131ecdc1d793372e5
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Feb 25 22:14:37 2014 +0100

    .

commit 80328be5757d7313cda73fc0c86e0711679449c2
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Tue Feb 25 22:14:03 2014 +0100

    .

-----------------------------------------------------------------------

Summary of changes:
 gdb/gdbserver/linux-low.c |   38 +++++++++++++++++++-------------------
 gdb/target.c              |    6 ------
 2 files changed, 19 insertions(+), 25 deletions(-)

First 500 lines of diff:
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 69580db..a9829dc 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -163,10 +163,7 @@ typedef union ElfXX_Nhdr
 #define ELFXX_SIZEOF(elf64, hdr) ((elf64) ? sizeof ((hdr)._64) \
 					  : sizeof ((hdr)._32))
 /* Round up to next 4 byte boundary.  */
-#define ELFXX_ROUNDUP_4(elf64, what) ((elf64) ? (((what) + 3)		\
-						 & ~((Elf64_Word)3U))	\
-					      : (((what) + 3)		\
-						 & ~((Elf32_Word) 3U)))
+#define ELFXX_ROUNDUP_4(elf64, what) (((what) + 3) & ~(ULONGEST) 3)
 #define BUILD_ID_INVALID "?"
 
 /* A list of all unknown processes which receive stop signals.  Some
@@ -5352,8 +5349,8 @@ get_phdr_phnum_from_proc_auxv (const int pid, const int is_elf64,
 
   if (*phdr_memaddr == 0 || *num_phdr == 0)
     {
-      warning ("Unexpected missing AT_PHDR and/or AT_PHNUM: "
-	       "phdr_memaddr = %ld, phdr_num = %d",
+      warning (_("Unexpected missing AT_PHDR and/or AT_PHNUM: "
+		 "phdr_memaddr = %ld, phdr_num = %d"),
 	       (long) *phdr_memaddr, *num_phdr);
       return 2;
     }
@@ -5612,7 +5609,7 @@ free_mapping_entry_vec (VEC (mapping_entry_s) *lst)
 static int
 compare_mapping_entry_range (const void *const k, const void *const b)
 {
-  const ULONGEST key = *(CORE_ADDR *) k;
+  const ULONGEST key = *(const CORE_ADDR *) k;
   const mapping_entry_s *const p = b;
 
   if (key < p->vaddr)
@@ -5660,7 +5657,8 @@ read_build_id (struct find_memory_region_callback_data *const p,
 	  || e_phentsize != ELFXX_SIZEOF (is_elf64, *phdr))
 	{
 	  /* Basic sanity check failed.  */
-	  warning ("Could not read program header.");
+	  warning (_("Could not identify program header at %s."),
+		   paddress (load_addr));
 	  return;
 	}
 
@@ -5671,7 +5669,8 @@ read_build_id (struct find_memory_region_callback_data *const p,
 			     ELFXX_FLD (is_elf64, ehdr, e_phnum) * e_phentsize)
 	  != 0)
 	{
-	  warning ("Could not read program header.");
+	  warning (_("Could not read program header at %s."),
+		   paddress (load_addr));
 	  return;
 	}
 
@@ -5695,14 +5694,14 @@ read_build_id (struct find_memory_region_callback_data *const p,
 				 ELFXX_FLD (is_elf64, *phdr, p_memsz)) != 0)
 	    {
 	      xfree (pt_note);
-	      warning ("Could not read note at address 0x%s",
+	      warning (_("Could not read note at address 0x%s"),
 		       paddress (note_addr));
 	      break;
 	    }
 
 	  pt_end = pt_note + ELFXX_FLD (is_elf64, *phdr, p_memsz);
 	  nhdr = (void *) pt_note;
-	  while ((gdb_byte *) nhdr < pt_end)
+	  while ((const gdb_byte *) nhdr < pt_end)
 	    {
 	      const size_t namesz
 		= ELFXX_ROUNDUP_4 (is_elf64, ELFXX_FLD (is_elf64, *nhdr,
@@ -5710,14 +5709,14 @@ read_build_id (struct find_memory_region_callback_data *const p,
 	      const size_t descsz
 		= ELFXX_ROUNDUP_4 (is_elf64, ELFXX_FLD (is_elf64, *nhdr,
 							n_descsz));
-	      const size_t note_sz = ELFXX_SIZEOF (is_elf64, *nhdr) + namesz
-				     + descsz;
+	      const size_t note_sz = (ELFXX_SIZEOF (is_elf64, *nhdr) + namesz
+				      + descsz);
 
-	      if (((gdb_byte *) nhdr + note_sz) > pt_end || note_sz == 0
+	      if (((const gdb_byte *) nhdr + note_sz) > pt_end || note_sz == 0
 		  || descsz == 0)
 		{
-		  warning ("Malformed PT_NOTE at address 0x%s\n",
-			   paddress ((CORE_ADDR) nhdr));
+		  warning (_("Malformed PT_NOTE at address 0x%s\n"),
+			   paddress (note_addr + (gdb_byte *) nhdr - pt_note));
 		  break;
 		}
 	      if (ELFXX_FLD (is_elf64, *nhdr, n_type) == NT_GNU_BUILD_ID
@@ -5829,9 +5828,10 @@ get_hex_build_id (const CORE_ADDR l_addr, const CORE_ADDR l_ld,
 	{
 	  /* Do not try to find hex_build_id again.  */
 	  bil->hex_build_id = xstrdup (BUILD_ID_INVALID);
-	  warning ("Could not determine load address; mapping entry with"
-		   " offset 0 corresponding to l_ld=0x%s could not be found; "
-		   "build-id can not be used.", paddress (l_ld));
+	  warning (_("Could not determine load address; mapping entry with "
+		     "offset 0 corresponding to l_ld = 0x%s could not be "
+		     "found; build-id can not be used."),
+		   paddress (l_ld));
 	}
     }
 
diff --git a/gdb/target.c b/gdb/target.c
index 8c6d6cc..1a66a76 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -3107,9 +3107,6 @@ target_fileio_close_cleanup (void *opaque)
   target_fileio_close (fd, &target_errno);
 }
 
-typedef int (read_alloc_pread_ftype) (int handle, gdb_byte *read_buf, int len,
-				      ULONGEST offset, int *target_errno);
-
 static read_alloc_pread_ftype target_fileio_read_alloc_1_pread;
 
 /* Helper for target_fileio_read_alloc_1 to make it interruptible.  */
@@ -3123,9 +3120,6 @@ target_fileio_read_alloc_1_pread (int handle, gdb_byte *read_buf, int len,
   return target_fileio_pread (handle, read_buf, len, offset, target_errno);
 }
 
-typedef LONGEST (read_stralloc_func_ftype) (const char *filename,
-					    gdb_byte **buf_p, int padding);
-
 static read_stralloc_func_ftype target_fileio_read_alloc_1;
 
 /* Read target file FILENAME.  Store the result in *BUF_P and


hooks/post-receive
--
Repository for Project Archer.