File binutils-2.19.51-objcopy.patch of Package mingw32-binutils

Overview Repositories Revisions Requests Users Attributes Meta

File binutils-2.19.51-objcopy.patch of Package mingw32-binutils (Revision 465f4d528a7ca846bcf0544c8f55d43e)

Currently displaying revision 465f4d528a7ca846bcf0544c8f55d43e , Show latest

Index: src/binutils/objcopy.c
===================================================================
--- src/binutils/objcopy.c	2009-08-11 20:54:49.000000000 +0200
+++ src/binutils/objcopy.c	2009-08-20 13:37:28.052473600 +0200
@@ -451,6 +451,7 @@
 static void setup_section (bfd *, asection *, void *);
 static void setup_bfd_headers (bfd *, bfd *);
 static void copy_section (bfd *, asection *, void *);
+static void adjust_base_relocation (bfd *, asection *);
 static void get_sections (bfd *, asection *, void *);
 static int compare_section_lma (const void *, const void *);
 static void mark_symbols_used_in_relocations (bfd *, asection *, void *);
@@ -1837,6 +1838,15 @@
   /* This has to happen after the symbol table has been set.  */
   bfd_map_over_sections (ibfd, copy_section, obfd);
 
+  /* Re-add for coff targets .reloc section.  */
+  if (bfd_get_flavour (ibfd) == bfd_target_coff_flavour
+      && bfd_get_flavour (obfd) == bfd_target_coff_flavour
+      && bfd_pei_p (obfd))
+    {
+      asection *breloc = bfd_get_section_by_name (obfd, ".reloc");
+      adjust_base_relocation (obfd, breloc);
+    }
+
   if (add_sections != NULL)
     {
       struct section_add *padd;
@@ -2524,6 +2534,93 @@
   bfd_nonfatal_message (NULL, obfd, osection, err);
 }
 
+static volatile bfd_vma breloc_va;
+static volatile int breloc_max;
+static volatile int breloc_result = 0;
+
+static void
+breloc_probe (bfd *abfd, asection *section,
+	      void *ignored ATTRIBUTE_UNUSED)
+{
+  bfd_size_type sec_size;
+  bfd_vma va_section;
+  pe_data_type *pe = pe_data (abfd);
+
+  if (!pe)
+    return;
+  if (breloc_result)
+    return;
+  sec_size = bfd_section_size (abfd, section);
+  va_section = bfd_get_section_vma (abfd, section) - pe->pe_opthdr.ImageBase;
+  if (breloc_va >= va_section && (breloc_va + breloc_max) < (va_section + sec_size))
+    breloc_result = 1;
+}
+
+static void
+adjust_base_relocation (bfd *obfd, asection *breloc)
+{
+  bfd_size_type dsize, oldsize, i, i_out;
+  bfd_byte *data = 0;
+  if (!breloc)
+    return;
+  oldsize = dsize = bfd_get_section_size (breloc);
+  if (!dsize)
+    return;
+  if (! bfd_malloc_and_get_section (obfd, breloc, &data))
+    {
+      if (data != NULL)
+	free (data);
+      return;
+    }
+  for (i_out = 0, i = 0; i < oldsize ;)
+    {
+      bfd_vma virtual_address;
+      long number, size, j;
+      int max = 0;
+      virtual_address = bfd_get_32 (obfd, data + i);
+      size = bfd_get_32 (obfd, data + i + 4);
+      number = (size - 8) / 2;
+      if (size == 0)
+	{
+	  if (i != i_out)
+	    memcpy (data + i_out, data + i, 8);
+	  i += 8;
+	  i_out += 8;
+	  break;
+	}
+      /* We search for max of this block.  */
+      for (j = 0; j < number; j++)
+	{
+	  unsigned short e = bfd_get_16 (obfd, data + i + 8 + j * 2);
+	  int off = e & 0x0FFF;
+	  if (max < off) max = off;
+	}
+      breloc_va = virtual_address;
+      breloc_max = max;
+      breloc_result = 0;
+      bfd_map_over_sections (obfd, breloc_probe, NULL);
+      if (breloc_result != 0)
+	{
+	  if (i != i_out)
+	    {
+	      memcpy (data + i_out, data + i, size);
+	    }
+	  i_out += size;
+	}
+      else
+      {
+        fprintf (stderr, "Not found va:0x%lx max=%d\n", (long) breloc_va, breloc_max);
+	dsize -= size;
+      }
+      i += size;
+    }
+  if (dsize != oldsize)
+    {
+      bfd_set_section_contents (obfd, breloc, data, 0, dsize);
+      bfd_set_section_size (obfd, breloc, dsize);
+    }
+}
+
 /* Copy the data of input section ISECTION of IBFD
    to an output section with the same name in OBFD.
    If stripping then don't copy any relocation info.  */

Places

File binutils-2.19.51-objcopy.patch of Package mingw32-binutils (Revision 465f4d528a7ca846bcf0544c8f55d43e)

Places