include/elf:

2002-07-01  Matt Thomas  <matt@3am-software.com>

* Rename EF_* to EF_VAX_*.

bfd:

2002-07-01  Matt Thomas  <matt@3am-software.com>

* elf32-vax.c (elf32_vax_print_private_bfd_data): Change EF_*
to EF_VAX_*.

binutils:

2002-07-01  Matt Thomas  <matt@3am-software.com>

* readelf.c: Include "elf/vax.h".
(guess_is_rela): Move EM_VAX from unknown to RELA case.
(dump_relocations): Handle VAX relocations.
(get_machine_flags): Handle VAX machine flags.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 89d813c..c3b7f97 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-01  Matt Thomas  <matt@3am-software.com>
+
+       * elf32-vax.c (elf32_vax_print_private_bfd_data): Change EF_*
+       to EF_VAX_*.
+
 2002-07-01  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
 
        * elfxx-mips.c (ABI_64_P): Fix comment.

diff --git a/bfd/elf32-vax.c b/bfd/elf32-vax.c
index bb5ee0b..e7145f1 100644 (file)
--- a/bfd/elf32-vax.c
+++ b/bfd/elf32-vax.c
@@ -542,13 +542,13 @@ elf32_vax_print_private_bfd_data (abfd, ptr)
   /* xgettext:c-format */
   fprintf (file, _("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
 
-  if (elf_elfheader (abfd)->e_flags & EF_NONPIC)
+  if (elf_elfheader (abfd)->e_flags & EF_VAX_NONPIC)
     fprintf (file, _(" [nonpic]"));
 
-  if (elf_elfheader (abfd)->e_flags & EF_DFLOAT)
+  if (elf_elfheader (abfd)->e_flags & EF_VAX_DFLOAT)
     fprintf (file, _(" [d-float]"));
 
-  if (elf_elfheader (abfd)->e_flags & EF_GFLOAT)
+  if (elf_elfheader (abfd)->e_flags & EF_VAX_GFLOAT)
     fprintf (file, _(" [g-float]"));
 
   fputc ('\n', file);

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 4d355e8..3290c76 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-01  Matt Thomas  <matt@3am-software.com>
+
+       * readelf.c: Include "elf/vax.h".
+       (guess_is_rela): Move EM_VAX from unknown to RELA case.
+       (dump_relocations): Handle VAX relocations.
+       (get_machine_flags): Handle VAX machine flags.
+
 2002-06-29  Stephane Carrez  <stcarrez@nerim.fr>
 
        * readelf.c (dump_relocations): Handle 68HC11/68HC12 relocations.

diff --git a/binutils/readelf.c b/binutils/readelf.c
index c018654..91e0691 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -80,6 +80,7 @@
 #include "elf/sh.h"
 #include "elf/sparc.h"
 #include "elf/v850.h"
+#include "elf/vax.h"
 #include "elf/x86-64.h"
 #include "elf/xstormy16.h"
 
@@ -649,6 +650,7 @@ guess_is_rela (e_machine)
     case EM_S390_OLD:
     case EM_MMIX:
     case EM_XSTORMY16:
+    case EM_VAX:
       return TRUE;
 
     case EM_MMA:
@@ -668,7 +670,6 @@ guess_is_rela (e_machine)
     case EM_68HC05:
     case EM_SVX:
     case EM_ST19:
-    case EM_VAX:
     default:
       warn (_("Don't know about relocations on this machine architecture\n"));
       return FALSE;
@@ -1121,6 +1122,10 @@ dump_relocations (file, rel_offset, rel_size, symtab, nsyms, strtab, is_rela)
        case EM_XSTORMY16:
          rtype = elf_xstormy16_reloc_type (type);
          break;
+
+       case EM_VAX:
+         rtype = elf_vax_reloc_type (type);
+         break;
        }
 
       if (rtype == NULL)
@@ -1921,6 +1926,15 @@ get_machine_flags (e_flags, e_machine)
          if ((e_flags & EF_IA_64_ABSOLUTE))
            strcat (buf, ", absolute");
          break;
+
+       case EM_VAX:
+         if ((e_flags & EF_VAX_NONPIC))
+           strcat (buf, ", non-PIC");
+         if ((e_flags & EF_VAX_DFLOAT))
+           strcat (buf, ", D-Float");
+         if ((e_flags & EF_VAX_GFLOAT))
+           strcat (buf, ", G-Float");
+         break;
        }
     }
 

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index cc8315d..6e38b48 100644 (file)
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-01  Matt Thomas  <matt@3am-software.com>
+
+       * Rename EF_* to EF_VAX_*.
+
 2002-06-18  Dave Brolley  <brolley@redhat.com>
 
        From Catherine Moore, Michael Meissner, Dave Brolley:

diff --git a/include/elf/vax.h b/include/elf/vax.h
index aba5d9f..c1b5c2b 100644 (file)
--- a/include/elf/vax.h
+++ b/include/elf/vax.h
@@ -44,8 +44,8 @@ START_RELOC_NUMBERS (elf_vax_reloc_type)
 END_RELOC_NUMBERS (R_VAX_max)   
 
 /* Processor specific flags for the ELF header e_flags field.  */
-#define EF_NONPIC              0x0001  /* Object contains non-PIC code */
-#define EF_DFLOAT              0x0100  /* Object contains D-Float insn.  */
-#define EF_GFLOAT              0x0200  /* Object contains G-Float insn.  */
+#define EF_VAX_NONPIC          0x0001  /* Object contains non-PIC code */
+#define EF_VAX_DFLOAT          0x0100  /* Object contains D-Float insn.  */
+#define EF_VAX_GFLOAT          0x0200  /* Object contains G-Float insn.  */
 
 #endif