2009-10-27 Kai Tietz <kai.tietz@onevision.com>

        * peXXigen.c (bfdver.h): Add include.
        (LINKER_VERSION): Do calculation based on BFD_VERSION.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e377ee9ab4c511f3d7f973bab1bcafca0ea0f16b..1a10ea43b17ec7edde2239022a4583d221852989 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-27  Kai Tietz  <kai.tietz@onevision.com>
+
+       * peXXigen.c (bfdver.h): Add include.
+       (LINKER_VERSION): Do calculation based on BFD_VERSION.
+
 2009-10-25  Maciej W. Rozycki  <macro@linux-mips.org>
 
        * elf32-vax.c (elf_vax_relocate_section): Correct assertion.

diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index 6ee03a758358bef383357ce8f24497236b036f6f..63ca3c0a3db670071390748d8b079874698ae164 100644 (file)
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -62,6 +62,7 @@
 #include "bfd.h"
 #include "libbfd.h"
 #include "coff/internal.h"
+#include "bfdver.h"
 
 /* NOTE: it's strange to be including an architecture specific header
    in what's supposed to be general (to PE/PEI) code.  However, that's
@@ -666,7 +667,8 @@ _bfd_XXi_swap_aouthdr_out (bfd * abfd, void * in, void * out)
 
   H_PUT_16 (abfd, aouthdr_in->magic, aouthdr_out->standard.magic);
 
-#define LINKER_VERSION 256 /* That is, 2.56 */
+/* e.g. 219510000 is linker version 2.19  */
+#define LINKER_VERSION ((short) (BFD_VERSION / 1000000))
 
   /* This piece of magic sets the "linker version" field to
      LINKER_VERSION.  */