Imported binutils-2.20

[msp430-binutils.git] / bfd / pef.c

diff --git a/bfd/pef.c b/bfd/pef.c
index a1b71acd8abb7c6a2a4ec71b1f51e8bf09559a63..4fcae1e5435f568d3d14bb2afe82c77a8de073c6 100644 (file)
--- a/bfd/pef.c
+++ b/bfd/pef.c
@@ -1,5 +1,5 @@
 /* PEF support for BFD.
 /* PEF support for BFD.

-   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -52,6 +52,7 @@
 #define bfd_pef_bfd_is_group_section               bfd_generic_is_group_section
 #define bfd_pef_bfd_discard_group                   bfd_generic_discard_group
 #define bfd_pef_section_already_linked             _bfd_generic_section_already_linked
 #define bfd_pef_bfd_is_group_section               bfd_generic_is_group_section
 #define bfd_pef_bfd_discard_group                   bfd_generic_discard_group
 #define bfd_pef_section_already_linked             _bfd_generic_section_already_linked

+#define bfd_pef_bfd_define_common_symbol            bfd_generic_define_common_symbol

 #define bfd_pef_bfd_link_hash_table_create          _bfd_generic_link_hash_table_create
 #define bfd_pef_bfd_link_hash_table_free            _bfd_generic_link_hash_table_free
 #define bfd_pef_bfd_link_add_symbols                _bfd_generic_link_add_symbols
 #define bfd_pef_bfd_link_hash_table_create          _bfd_generic_link_hash_table_create
 #define bfd_pef_bfd_link_hash_table_free            _bfd_generic_link_hash_table_free
 #define bfd_pef_bfd_link_add_symbols                _bfd_generic_link_add_symbols


@@ -97,7 +98,7 @@ bfd_pef_parse_traceback_table (bfd *abfd,
   if (! (table.flags2 & TB_NAME_PRESENT))
     return -1;
 
   if (! (table.flags2 & TB_NAME_PRESENT))
     return -1;
 

-  if (! table.flags1 & TB_HAS_TBOFF)
+  if (! (table.flags1 & TB_HAS_TBOFF))

     return -1;
 
   offset = 8;
     return -1;
 
   offset = 8;


@@ -186,7 +187,7 @@ bfd_pef_parse_traceback_table (bfd *abfd,
     offset += 4;
 
   if (file != NULL)
     offset += 4;
 
   if (file != NULL)

-    fprintf (file, " [length = 0x%lx]", (long) offset);
+    fprintf (file, " [length = 0x%lx]", (unsigned long) offset);

 
   return offset;
 }
 
   return offset;
 }


@@ -360,7 +361,7 @@ bfd_pef_parse_imported_symbol (bfd *abfd ATTRIBUTE_UNUSED,
   BFD_ASSERT (len == 4);
 
   value = bfd_getb32 (buf);
   BFD_ASSERT (len == 4);
 
   value = bfd_getb32 (buf);

-  symbol->class = value >> 24;
+  symbol->symbol_class = value >> 24;

   symbol->name = value & 0x00ffffff;
 
   return 0;
   symbol->name = value & 0x00ffffff;
 
   return 0;