Merge GDB 7.5.1

bfd/ppcboot.c

Index: bfd/ppcboot.c
diff --git a/bfd/ppcboot.c b/bfd/ppcboot.c
index c2b4c3be795299aba901111bbc0986d1fa5fefe2..b0718d8c7936d8d27599171233b31f53f4b54457 100644
--- a/bfd/ppcboot.c
+++ b/bfd/ppcboot.c
@@ -1,6 +1,6 @@
 /* BFD back-end for PPCbug boot records.
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2011 Free Software Foundation, Inc.
+   2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
    Written by Michael Meissner, Cygnus Support, <meissner@cygnus.com>
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -40,7 +40,8 @@
 #include "libbfd.h"
 
 /* PPCbug location structure */
-typedef struct ppcboot_location {
+typedef struct ppcboot_location
+{
   bfd_byte	ind;
   bfd_byte	head;
   bfd_byte	sector;
@@ -48,7 +49,8 @@ typedef struct ppcboot_location {
 } ppcboot_location_t;
 
 /* PPCbug partition table layout */
-typedef struct ppcboot_partition {
+typedef struct ppcboot_partition
+{
   ppcboot_location_t	partition_begin;	/* partition begin */
   ppcboot_location_t	partition_end;		/* partition end */
   bfd_byte		sector_begin[4];	/* 32-bit start RBA (zero-based), little endian */
@@ -56,7 +58,8 @@ typedef struct ppcboot_partition {
 } ppcboot_partition_t;
 
 /* PPCbug boot layout.  */
-typedef struct ppcboot_hdr {
+typedef struct ppcboot_hdr
+{
   bfd_byte		pc_compatibility[446];	/* x86 instruction field */
   ppcboot_partition_t	partition[4];		/* partition information */
   bfd_byte		signature[2];		/* 0x55 and 0xaa */
@@ -80,7 +83,8 @@ ppcboot_hdr_t;
 #define PPC_IND 0x41
 
 /* Information needed for ppcboot header */
-typedef struct ppcboot_data {
+typedef struct ppcboot_data
+{
   ppcboot_hdr_t	header;				/* raw header */
   asection *sec;				/* single section */
 } ppcboot_data_t;
@@ -89,28 +93,13 @@ typedef struct ppcboot_data {
    a start symbol, an end symbol, and an absolute length symbol.  */
 #define PPCBOOT_SYMS 3
 
-static bfd_boolean ppcboot_mkobject PARAMS ((bfd *));
-static const bfd_target *ppcboot_object_p PARAMS ((bfd *));
-static bfd_boolean ppcboot_set_arch_mach
-  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static bfd_boolean ppcboot_get_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static long ppcboot_get_symtab_upper_bound PARAMS ((bfd *));
-static char *mangle_name PARAMS ((bfd *, char *));
-static long ppcboot_canonicalize_symtab PARAMS ((bfd *, asymbol **));
-static void ppcboot_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static bfd_boolean ppcboot_set_section_contents
-  PARAMS ((bfd *, asection *, const PTR, file_ptr, bfd_size_type));
-static bfd_boolean ppcboot_bfd_print_private_bfd_data PARAMS ((bfd *, PTR));
-
-#define ppcboot_set_tdata(abfd, ptr) ((abfd)->tdata.any = (PTR) (ptr))
+#define ppcboot_set_tdata(abfd, ptr) ((abfd)->tdata.any = (ptr))
 #define ppcboot_get_tdata(abfd) ((ppcboot_data_t *) ((abfd)->tdata.any))
 
 /* Create a ppcboot object.  Invoked via bfd_set_format.  */
 
 static bfd_boolean
-ppcboot_mkobject (abfd)
-     bfd *abfd;
+ppcboot_mkobject (bfd *abfd)
 {
   if (!ppcboot_get_tdata (abfd))
     {
@@ -124,10 +113,9 @@ ppcboot_mkobject (abfd)
 
 /* Set the architecture to PowerPC */
 static bfd_boolean
-ppcboot_set_arch_mach (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
+ppcboot_set_arch_mach (bfd *abfd,
+		       enum bfd_architecture arch,
+		       unsigned long machine)
 {
   if (arch == bfd_arch_unknown)
     arch = bfd_arch_powerpc;
@@ -144,8 +132,7 @@ ppcboot_set_arch_mach (abfd, arch, machine)
    being ppcboot.  */
 
 static const bfd_target *
-ppcboot_object_p (abfd)
-     bfd *abfd;
+ppcboot_object_p (bfd *abfd)
 {
   struct stat statbuf;
   asection *sec;
@@ -175,7 +162,7 @@ ppcboot_object_p (abfd)
       return NULL;
     }
 
-  if (bfd_bread ((PTR) &hdr, (bfd_size_type) sizeof (hdr), abfd)
+  if (bfd_bread (&hdr, (bfd_size_type) sizeof (hdr), abfd)
       != sizeof (hdr))
     {
       if (bfd_get_error () != bfd_error_system_call)
@@ -218,7 +205,7 @@ ppcboot_object_p (abfd)
   ppcboot_mkobject (abfd);
   tdata = ppcboot_get_tdata (abfd);
   tdata->sec = sec;
-  memcpy ((PTR) &tdata->header, (PTR) &hdr, sizeof (ppcboot_hdr_t));
+  memcpy (&tdata->header, &hdr, sizeof (ppcboot_hdr_t));
 
   ppcboot_set_arch_mach (abfd, bfd_arch_powerpc, 0L);
   return abfd->xvec;
@@ -232,12 +219,11 @@ ppcboot_object_p (abfd)
 /* Get contents of the only section.  */
 
 static bfd_boolean
-ppcboot_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section ATTRIBUTE_UNUSED;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
+ppcboot_get_section_contents (bfd *abfd,
+			      asection *section ATTRIBUTE_UNUSED,
+			      void * location,
+			      file_ptr offset,
+			      bfd_size_type count)
 {
   if (bfd_seek (abfd, offset + (file_ptr) sizeof (ppcboot_hdr_t), SEEK_SET) != 0
       || bfd_bread (location, count, abfd) != count)
@@ -249,8 +235,7 @@ ppcboot_get_section_contents (abfd, section, location, offset, count)
 /* Return the amount of memory needed to read the symbol table.  */
 
 static long
-ppcboot_get_symtab_upper_bound (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+ppcboot_get_symtab_upper_bound (bfd *abfd ATTRIBUTE_UNUSED)
 {
   return (PPCBOOT_SYMS + 1) * sizeof (asymbol *);
 }
@@ -259,9 +244,7 @@ ppcboot_get_symtab_upper_bound (abfd)
 /* Create a symbol name based on the bfd's filename.  */
 
 static char *
-mangle_name (abfd, suffix)
-     bfd *abfd;
-     char *suffix;
+mangle_name (bfd *abfd, char *suffix)
 {
   bfd_size_type size;
   char *buf;
@@ -289,9 +272,7 @@ mangle_name (abfd, suffix)
 /* Return the symbol table.  */
 
 static long
-ppcboot_canonicalize_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
+ppcboot_canonicalize_symtab (bfd *abfd, asymbol **alocation)
 {
   asection *sec = ppcboot_get_tdata (abfd)->sec;
   asymbol *syms;
@@ -339,10 +320,9 @@ ppcboot_canonicalize_symtab (abfd, alocation)
 /* Get information about a symbol.  */
 
 static void
-ppcboot_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
-     asymbol *symbol;
-     symbol_info *ret;
+ppcboot_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+			 asymbol *symbol,
+			 symbol_info *ret)
 {
   bfd_symbol_info (symbol, ret);
 }
@@ -360,12 +340,11 @@ ppcboot_get_symbol_info (ignore_abfd, symbol, ret)
 /* Write section contents of a ppcboot file.  */
 
 static bfd_boolean
-ppcboot_set_section_contents (abfd, sec, data, offset, size)
-     bfd *abfd;
-     asection *sec;
-     const PTR data;
-     file_ptr offset;
-     bfd_size_type size;
+ppcboot_set_section_contents (bfd *abfd,
+			      asection *sec,
+			      const void * data,
+			      file_ptr offset,
+			      bfd_size_type size)
 {
   if (! abfd->output_has_begun)
     {
@@ -401,14 +380,12 @@ ppcboot_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
 /* Print out the program headers.  */
 
 static bfd_boolean
-ppcboot_bfd_print_private_bfd_data (abfd, farg)
-     bfd *abfd;
-     PTR farg;
+ppcboot_bfd_print_private_bfd_data (bfd *abfd, void * farg)
 {
   FILE *f = (FILE *)farg;
   ppcboot_data_t *tdata = ppcboot_get_tdata (abfd);
-  long entry_offset = bfd_getl_signed_32 ((PTR) tdata->header.entry_offset);
-  long length = bfd_getl_signed_32 ((PTR) tdata->header.length);
+  long entry_offset = bfd_getl_signed_32 (tdata->header.entry_offset);
+  long length = bfd_getl_signed_32 (tdata->header.length);
   int i;
 
   fprintf (f, _("\nppcboot header:\n"));
@@ -428,8 +405,8 @@ ppcboot_bfd_print_private_bfd_data (abfd, farg)
 
   for (i = 0; i < 4; i++)
     {
-      long sector_begin  = bfd_getl_signed_32 ((PTR) tdata->header.partition[i].sector_begin);
-      long sector_length = bfd_getl_signed_32 ((PTR) tdata->header.partition[i].sector_length);
+      long sector_begin  = bfd_getl_signed_32 (tdata->header.partition[i].sector_begin);
+      long sector_length = bfd_getl_signed_32 (tdata->header.partition[i].sector_length);
 
       /* Skip all 0 entries */
       if (!tdata->header.partition[i].partition_begin.ind