2001-08-10 H.J. Lu <hjl@gnu.org>

[deliverable/binutils-gdb.git] / bfd / ppcboot.c

diff --git a/bfd/ppcboot.c b/bfd/ppcboot.c
index d9db8268d478502b392be6fff6d4813b704b9ea3..eccbe7980cba546d676cec9d089ba3eb48b2c09d 100644 (file)
--- a/bfd/ppcboot.c
+++ b/bfd/ppcboot.c
@@ -1,5 +1,6 @@
 /* BFD back-end for PPCbug boot records.
-   Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
    Written by Michael Meissner, Cygnus Support, <meissner@cygnus.com>
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -64,7 +65,11 @@ typedef struct ppcboot_hdr {
   bfd_byte             os_id;                  /* OS_ID */
   char                 partition_name[32];     /* partition name */
   bfd_byte             reserved1[470];         /* reserved */
-} ppcboot_hdr_t;
+}
+#ifdef __GNUC__
+  __attribute__ ((packed))
+#endif
+ppcboot_hdr_t;
 
 /* Signature bytes for last 2 bytes of the 512 byte record */
 #define SIGNATURE0 0x55
@@ -230,7 +235,7 @@ ppcboot_get_section_contents (abfd, section, location, offset, count)
      file_ptr offset;
      bfd_size_type count;
 {
-  if (bfd_seek (abfd, offset + sizeof(ppcboot_hdr_t), SEEK_SET) != 0
+  if (bfd_seek (abfd, offset + sizeof (ppcboot_hdr_t), SEEK_SET) != 0
       || bfd_read (location, 1, count, abfd) != count)
     return false;
   return true;
@@ -470,6 +475,7 @@ ppcboot_bfd_print_private_bfd_data (abfd, farg)
   bfd_generic_get_relocated_section_contents
 #define ppcboot_bfd_relax_section bfd_generic_relax_section
 #define ppcboot_bfd_gc_sections bfd_generic_gc_sections
+#define ppcboot_bfd_merge_sections bfd_generic_merge_sections
 #define ppcboot_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
 #define ppcboot_bfd_link_add_symbols _bfd_generic_link_add_symbols
 #define ppcboot_bfd_final_link _bfd_generic_final_link
@@ -532,6 +538,6 @@ const bfd_target ppcboot_vec =
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   NULL,
-  
+
   NULL
 };