Changeset 1248

Timestamp:

Feb 15, 2004, 10:53:13 AM (21 years ago)

Author:

bird

Message:

#905: Do relocations more like ELF, ensuring we relocate to a symbol for externals & weaks.

File:

• trunk/src/binutils/bfd/i386aoutemx.c (modified) (3 diffs, 1 prop)

trunk/src/binutils/bfd/i386aoutemx.c

@@ -24 +24 @@
 #include "bfd.h"
 #include "libbfd.h"
-#include "libaout.h"
 #ifndef EMX
 #error "EMX TARGET! EMX isn't defined!!!"
 #endif
 
-#define MY_object_p MY(object_p)
-#define MY_backend_data &MY(backend_data)
-
-static bfd_boolean MY(set_sizes) PARAMS ((bfd *));
-static const bfd_target *MY(object_p) PARAMS ((bfd *));
-
-static CONST struct aout_backend_data MY(backend_data) = {
+#include <symcat.h>
+#define MY_object_p                 MY(object_p)
+#define MY_backend_data            &MY(backend_data)
+#define MY_bfd_reloc_type_lookup    i386aout_emx_reloc_type_lookup
+
+#include "libaout.h"
+#include "aout/aout64.h"
+
+static bfd_boolean      MY(set_sizes) PARAMS ((bfd *));
+const bfd_target *      MY(object_p) PARAMS ((bfd *));
+reloc_howto_type *      MY(reloc_type_lookup) PARAMS ((bfd *, bfd_reloc_code_real_type));
+bfd_reloc_status_type   MY(generic_reloc) PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+/*reloc_howto_type *  MY(reloc_howto) PARAMS ((bfd *, struct reloc_std_external *, int *, int *, int *));*/
+
+reloc_howto_type MY(howto_table_std)[] =
+{
+  /* type              rs size bsz  pcrel bitpos ovrf                     sf                name      part_inpl readmask  setmask    pcdone.  */
+HOWTO ( 0,             0,  0,   8,  FALSE, 0, complain_overflow_bitfield, MY(generic_reloc),"8",        TRUE, 0x000000ff,0x000000ff, FALSE),
+HOWTO ( 1,             0,  1,   16, FALSE, 0, complain_overflow_bitfield, MY(generic_reloc),"16",       TRUE, 0x0000ffff,0x0000ffff, FALSE),
+HOWTO ( 2,             0,  2,   32, FALSE, 0, complain_overflow_bitfield, MY(generic_reloc),"32",       TRUE, 0xffffffff,0xffffffff, FALSE),
+HOWTO ( 3,             0,  4,   64, FALSE, 0, complain_overflow_bitfield, MY(generic_reloc),"64",       TRUE, 0xdeaddead,0xdeaddead, FALSE),
+HOWTO ( 4,             0,  0,   8,  TRUE,  0, complain_overflow_signed,   MY(generic_reloc),"DISP8",    TRUE, 0x000000ff,0x000000ff, FALSE),
+HOWTO ( 5,             0,  1,   16, TRUE,  0, complain_overflow_signed,   MY(generic_reloc),"DISP16",   TRUE, 0x0000ffff,0x0000ffff, FALSE),
+HOWTO ( 6,             0,  2,   32, TRUE,  0, complain_overflow_signed,   MY(generic_reloc),"DISP32",   TRUE, 0xffffffff,0xffffffff, FALSE),
+HOWTO ( 7,             0,  4,   64, TRUE,  0, complain_overflow_signed,   MY(generic_reloc),"DISP64",   TRUE, 0xfeedface,0xfeedface, FALSE),
+HOWTO ( 8,             0,  2,    0, FALSE, 0, complain_overflow_bitfield, MY(generic_reloc),"GOT_REL",  FALSE,         0,0x00000000, FALSE),
+HOWTO ( 9,             0,  1,   16, FALSE, 0, complain_overflow_bitfield, MY(generic_reloc),"BASE16",   FALSE,0xffffffff,0xffffffff, FALSE),
+HOWTO (10,             0,  2,   32, FALSE, 0, complain_overflow_bitfield, MY(generic_reloc),"BASE32",   FALSE,0xffffffff,0xffffffff, FALSE),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+  HOWTO (16,           0,  2,    0, FALSE, 0, complain_overflow_bitfield, MY(generic_reloc),"JMP_TABLE", FALSE,         0,0x00000000, FALSE),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+  HOWTO (32,           0,  2,    0, FALSE, 0, complain_overflow_bitfield, MY(generic_reloc),"RELATIVE",  FALSE,         0,0x00000000, FALSE),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+EMPTY_HOWTO (-1),
+  HOWTO (40,           0,  2,    0, FALSE, 0, complain_overflow_bitfield,0,"BASEREL",   FALSE,         0,0x00000000, FALSE),
+};
+
+
+CONST struct aout_backend_data MY(backend_data) = {
   0,                            /* zmagic contiguous */
   0,                            /* text incl header */
@@ -101 +155 @@
 #endif
 
+
 /*
  * Finish up the reading of an a.out file header
  */
-static const bfd_target *
+const bfd_target *
 MY(object_p) (abfd)
   bfd *abfd;
@@ -135 +190 @@
   return target;
 }
+
+
+reloc_howto_type *
+MY(reloc_type_lookup) (abfd,code)
+     bfd *abfd;
+     bfd_reloc_code_real_type code;
+{
+#define STD(i, j)       case i: return &MY(howto_table_std)[j]
+
+  if (obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE)
+    return NAME(aout,reloc_type_lookup) (abfd, code);
+
+
+  if (code == BFD_RELOC_CTOR)
+    switch (bfd_get_arch_info (abfd)->bits_per_address)
+      {
+      case 32:
+        code = BFD_RELOC_32;
+        break;
+      case 64:
+        code = BFD_RELOC_64;
+        break;
+      }
+
+  /* std relocs.  */
+  switch (code)
+    {
+      STD (BFD_RELOC_8, 0);
+      STD (BFD_RELOC_16, 1);
+      STD (BFD_RELOC_32, 2);
+      STD (BFD_RELOC_8_PCREL, 4);
+      STD (BFD_RELOC_16_PCREL, 5);
+      STD (BFD_RELOC_32_PCREL, 6);
+      STD (BFD_RELOC_16_BASEREL, 9);
+      STD (BFD_RELOC_32_BASEREL, 10);
+    default: return (reloc_howto_type *) NULL;
+    }
+}
+
+/* ELF relocs are against symbols.  If we are producing relocateable
+   output, and the reloc is against an external symbol, and nothing
+   has given us any additional addend, the resulting reloc will also
+   be against the same symbol.  In such a case, we don't want to
+   change anything about the way the reloc is handled, since it will
+   all be done at final link time.  Rather than put special case code
+   into bfd_perform_relocation, all the reloc types use this howto
+   function.  It just short circuits the reloc if producing
+   relocateable output against an external symbol.  */
+
+bfd_reloc_status_type
+MY(generic_reloc) (abfd,
+                   reloc_entry,
+                   symbol,
+                   data,
+                   input_section,
+                   output_bfd,
+                   error_message)
+     bfd *abfd ATTRIBUTE_UNUSED;
+     arelent *reloc_entry;
+     asymbol *symbol;
+     PTR data ATTRIBUTE_UNUSED;
+     asection *input_section;
+     bfd *output_bfd;
+     char **error_message ATTRIBUTE_UNUSED;
+{
+  if (output_bfd != (bfd *) NULL
+      && (symbol->flags & BSF_SECTION_SYM) == 0
+      && (! reloc_entry->howto->partial_inplace
+          || reloc_entry->addend == 0))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  return bfd_reloc_continue;
+}
+