diff mbox

[v2,1/3] Use the ELF class to determine the word size for FreeBSD core notes.

Message ID 20161206210015.40422-2-jhb@FreeBSD.org
State New, archived
Headers

Commit Message

John Baldwin Dec. 6, 2016, 9 p.m. UTC 
  FreeBSD MIPS64 core dumps contain an empty e_flags value so are assigned
to the default bfd_arch_mips which is 32-bits.

bfd/ChangeLog:

	* elf.c (elfcore_grok_freebsd_psinfo): Use ELF header class to
	determine structure sizes.
	(elfcore_grok_freebsd_prstatus): Likewise.
---
 bfd/ChangeLog |  6 ++++++
 bfd/elf.c     | 23 +++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

Comments

Nick Clifton Dec. 13, 2016, 11:04 a.m. UTC | #1 
Hi John,

> FreeBSD MIPS64 core dumps contain an empty e_flags value so are assigned
> to the default bfd_arch_mips which is 32-bits.

I am sorry, but I am worried about this patch breaking things for other,
non-MIPS targets.  Wouldn't it be easier to update bfd/elfxx-mips.c:_bfd_elf_mips_mach()
to test the EI_CLASS field if no flags are set.  Maybe by using the ABI_64_P macro ?

Cheers
  Nick
diff mbox

Patch

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 26fb42b..dd41d1a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@ 
+2016-12-06  John Baldwin  <jhb@FreeBSD.org>
+
+	* elf.c (elfcore_grok_freebsd_psinfo): Use ELF header class to
+	determine structure sizes.
+	(elfcore_grok_freebsd_prstatus): Likewise.
+
 2016-12-06  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/20931
diff --git a/bfd/elf.c b/bfd/elf.c
index 678c043..c7c7ff1 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -9714,14 +9714,14 @@  elfcore_grok_freebsd_psinfo (bfd *abfd, Elf_Internal_Note *note)
 {
   size_t offset;
 
-  switch (abfd->arch_info->bits_per_word)
+  switch (elf_elfheader (abfd)->e_ident[EI_CLASS])
     {
-    case 32:
+    case ELFCLASS32:
       if (note->descsz < 108)
 	return FALSE;
       break;
 
-    case 64:
+    case ELFCLASS64:
       if (note->descsz < 120)
 	return FALSE;
       break;
@@ -9736,7 +9736,7 @@  elfcore_grok_freebsd_psinfo (bfd *abfd, Elf_Internal_Note *note)
   offset = 4;
 
   /* Skip over pr_psinfosz. */
-  if (abfd->arch_info->bits_per_word == 32)
+  if (elf_elfheader (abfd)->e_ident[EI_CLASS] == ELFCLASS32)
     offset += 4;
   else
     {
@@ -9779,13 +9779,13 @@  elfcore_grok_freebsd_prstatus (bfd *abfd, Elf_Internal_Note *note)
   offset = 4;
 
   /* Skip over pr_statussz.  */
-  switch (abfd->arch_info->bits_per_word)
+  switch (elf_elfheader (abfd)->e_ident[EI_CLASS])
     {
-    case 32:
+    case ELFCLASS32:
       offset += 4;
       break;
 
-    case 64:
+    case ELFCLASS64:
       offset += 4;	/* Padding before pr_statussz. */
       offset += 8;
       break;
@@ -9795,13 +9795,16 @@  elfcore_grok_freebsd_prstatus (bfd *abfd, Elf_Internal_Note *note)
     }
 
   /* Extract size of pr_reg from pr_gregsetsz.  */
-  if (abfd->arch_info->bits_per_word == 32)
+  if (elf_elfheader (abfd)->e_ident[EI_CLASS] == ELFCLASS32)
     size = bfd_h_get_32 (abfd, (bfd_byte *) note->descdata + offset);
   else
     size = bfd_h_get_64 (abfd, (bfd_byte *) note->descdata + offset);
 
   /* Skip over pr_gregsetsz and pr_fpregsetsz. */
-  offset += (abfd->arch_info->bits_per_word / 8) * 2;
+  if (elf_elfheader (abfd)->e_ident[EI_CLASS] == ELFCLASS32)
+    offset += 4 * 2;
+  else
+    offset += 8 * 2;
 
   /* Skip over pr_osreldate. */
   offset += 4;
@@ -9818,7 +9821,7 @@  elfcore_grok_freebsd_prstatus (bfd *abfd, Elf_Internal_Note *note)
   offset += 4;
 
   /* Padding before pr_reg. */
-  if (abfd->arch_info->bits_per_word == 64)
+  if (elf_elfheader (abfd)->e_ident[EI_CLASS] == ELFCLASS64)
     offset += 4;
 
   /* Make a ".reg/999" section and a ".reg" section.  */