X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fppcboot.c;h=eccbe7980cba546d676cec9d089ba3eb48b2c09d;hb=6c426cf36e042f2ef86fdb7d6c7e5e6a7ddb0e1c;hp=cbda407ea336d170025dd7890aca99c8c8b081c7;hpb=252b5132c753830d5fd56823373aed85f2a0db63;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/ppcboot.c b/bfd/ppcboot.c
index cbda407ea3..eccbe7980c 100644
--- a/bfd/ppcboot.c
+++ b/bfd/ppcboot.c
@@ -1,5 +1,6 @@
 /* BFD back-end for PPCbug boot records.
-   Copyright 1996, 1997, 1998 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
@@ -225,12 +230,12 @@ ppcboot_object_p (abfd)
 static boolean
 ppcboot_get_section_contents (abfd, section, location, offset, count)
      bfd *abfd;
-     asection *section;
+     asection *section ATTRIBUTE_UNUSED;
      PTR location;
      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;
@@ -241,7 +246,7 @@ ppcboot_get_section_contents (abfd, section, location, offset, count)
 
 static long
 ppcboot_get_symtab_upper_bound (abfd)
-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;
 {
   return (PPCBOOT_SYMS + 1) * sizeof (asymbol *);
 }
@@ -340,7 +345,7 @@ ppcboot_make_empty_symbol (abfd)
 
 static void
 ppcboot_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
+     bfd *ignore_abfd ATTRIBUTE_UNUSED;
      asymbol *symbol;
      symbol_info *ret;
 {
@@ -395,8 +400,8 @@ ppcboot_set_section_contents (abfd, sec, data, offset, size)
 
 static int
 ppcboot_sizeof_headers (abfd, exec)
-     bfd *abfd;
-     boolean exec;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     boolean exec ATTRIBUTE_UNUSED;
 {
   return sizeof (ppcboot_hdr_t);
 }
@@ -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
@@ -531,5 +537,7 @@ const bfd_target ppcboot_vec =
   BFD_JUMP_TABLE_LINK (ppcboot),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
+  NULL,
+
   NULL
 };