Suppress extra addition of ImageBase.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2ce1c3c1efad837a5206941d50b4235e120c9bf4..082c64383b1f6285f79fbf19837e6dc985afa6b0 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-09  Nick Clifton  <nickc@redhat.com>
+
+       * peigen.c (_bfd_pe_get_symbol_info): Suppress addition of
+       ImageBase.  This has already been done by coff_swap_hdr_in.
+
 2001-02-09  Jakub Jelinek  <jakub@redhat.com>
 
        * elf64-sparc.c (sparc64_elf_copy_private_bfd_data): New function.

diff --git a/bfd/peigen.c b/bfd/peigen.c
index 094920cfd4d1c075c9315a94fbc31cac0fe238a8..699c7267b28d85baae06164fb826ead99d4dc422 100644 (file)
--- a/bfd/peigen.c
+++ b/bfd/peigen.c
@@ -1958,12 +1958,14 @@ _bfd_pe_get_symbol_info (abfd, symbol, ret)
      symbol_info *ret;
 {
   coff_get_symbol_info (abfd, symbol, ret);
-
+#if 0 /* This code no longer appears to be necessary.
+        ImageBase has already been added in by coff_swap_scnhdr_in.  */
   if (pe_data (abfd) != NULL
       && ((symbol->flags & BSF_DEBUGGING) == 0
          || (symbol->flags & BSF_DEBUGGING_RELOC) != 0)
       && ! bfd_is_abs_section (symbol->section))
     ret->value += pe_data (abfd)->pe_opthdr.ImageBase;
+#endif
 }
 
 /* Handle the .idata section and other things that need symbol table