Import of Binutils from the FSF 2.15 branch (just post-.0 release).

These bits are taken from the FSF anoncvs repo on 23-May-2004 04:41:00 UTC.

1 files changed, 269 insertions, 884 deletions

diff --git a/contrib/binutils/bfd/libbfd.c b/contrib/binutils/bfd/libbfd.c
index f21abbc..be090e9 100644
--- a/contrib/binutils/bfd/libbfd.c
+++ b/contrib/binutils/bfd/libbfd.c
@@ -1,6 +1,6 @@
 /* Assorted BFD support routines, only used internally.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002
+   2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -28,8 +28,6 @@
 #define getpagesize() 2048
 #endif
 
-static size_t real_read PARAMS ((PTR, size_t, size_t, FILE *));
-
 /*
 SECTION
 	Internal functions
@@ -43,52 +41,46 @@ DESCRIPTION
 /* A routine which is used in target vectors for unsupported
    operations.  */
 
-boolean
-bfd_false (ignore)
-     bfd *ignore ATTRIBUTE_UNUSED;
+bfd_boolean
+bfd_false (bfd *ignore ATTRIBUTE_UNUSED)
 {
   bfd_set_error (bfd_error_invalid_operation);
-  return false;
+  return FALSE;
 }
 
 /* A routine which is used in target vectors for supported operations
    which do not actually do anything.  */
 
-boolean
-bfd_true (ignore)
-     bfd *ignore ATTRIBUTE_UNUSED;
+bfd_boolean
+bfd_true (bfd *ignore ATTRIBUTE_UNUSED)
 {
-  return true;
+  return TRUE;
 }
 
 /* A routine which is used in target vectors for unsupported
    operations which return a pointer value.  */
 
-PTR
-bfd_nullvoidptr (ignore)
-     bfd *ignore ATTRIBUTE_UNUSED;
+void *
+bfd_nullvoidptr (bfd *ignore ATTRIBUTE_UNUSED)
 {
   bfd_set_error (bfd_error_invalid_operation);
   return NULL;
 }
 
 int
-bfd_0 (ignore)
-     bfd *ignore ATTRIBUTE_UNUSED;
+bfd_0 (bfd *ignore ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 unsigned int
-bfd_0u (ignore)
-     bfd *ignore ATTRIBUTE_UNUSED;
+bfd_0u (bfd *ignore ATTRIBUTE_UNUSED)
 {
    return 0;
 }
 
 long
-bfd_0l (ignore)
-     bfd *ignore ATTRIBUTE_UNUSED;
+bfd_0l (bfd *ignore ATTRIBUTE_UNUSED)
 {
   return 0;
 }
@@ -97,53 +89,48 @@ bfd_0l (ignore)
    operations which return -1 on error.  */
 
 long
-_bfd_n1 (ignore_abfd)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
+_bfd_n1 (bfd *ignore_abfd ATTRIBUTE_UNUSED)
 {
   bfd_set_error (bfd_error_invalid_operation);
   return -1;
 }
 
 void
-bfd_void (ignore)
-     bfd *ignore ATTRIBUTE_UNUSED;
+bfd_void (bfd *ignore ATTRIBUTE_UNUSED)
 {
 }
 
-boolean
-_bfd_nocore_core_file_matches_executable_p (ignore_core_bfd, ignore_exec_bfd)
-     bfd *ignore_core_bfd ATTRIBUTE_UNUSED;
-     bfd *ignore_exec_bfd ATTRIBUTE_UNUSED;
+bfd_boolean
+_bfd_nocore_core_file_matches_executable_p
+  (bfd *ignore_core_bfd ATTRIBUTE_UNUSED,
+   bfd *ignore_exec_bfd ATTRIBUTE_UNUSED)
 {
   bfd_set_error (bfd_error_invalid_operation);
-  return false;
+  return FALSE;
 }
 
 /* Routine to handle core_file_failing_command entry point for targets
    without core file support.  */
 
 char *
-_bfd_nocore_core_file_failing_command (ignore_abfd)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
+_bfd_nocore_core_file_failing_command (bfd *ignore_abfd ATTRIBUTE_UNUSED)
 {
   bfd_set_error (bfd_error_invalid_operation);
-  return (char *)NULL;
+  return NULL;
 }
 
 /* Routine to handle core_file_failing_signal entry point for targets
    without core file support.  */
 
 int
-_bfd_nocore_core_file_failing_signal (ignore_abfd)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
+_bfd_nocore_core_file_failing_signal (bfd *ignore_abfd ATTRIBUTE_UNUSED)
 {
   bfd_set_error (bfd_error_invalid_operation);
   return 0;
 }
 
 const bfd_target *
-_bfd_dummy_target (ignore_abfd)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
+_bfd_dummy_target (bfd *ignore_abfd ATTRIBUTE_UNUSED)
 {
   bfd_set_error (bfd_error_wrong_format);
   return 0;
@@ -151,11 +138,10 @@ _bfd_dummy_target (ignore_abfd)
 
 /* Allocate memory using malloc.  */
 
-PTR
-bfd_malloc (size)
-     bfd_size_type size;
+void *
+bfd_malloc (bfd_size_type size)
 {
-  PTR ptr;
+  void *ptr;
 
   if (size != (size_t) size)
     {
@@ -163,7 +149,7 @@ bfd_malloc (size)
       return NULL;
     }
 
-  ptr = (PTR) malloc ((size_t) size);
+  ptr = malloc ((size_t) size);
   if (ptr == NULL && (size_t) size != 0)
     bfd_set_error (bfd_error_no_memory);
 
@@ -172,12 +158,10 @@ bfd_malloc (size)
 
 /* Reallocate memory using realloc.  */
 
-PTR
-bfd_realloc (ptr, size)
-     PTR ptr;
-     bfd_size_type size;
+void *
+bfd_realloc (void *ptr, bfd_size_type size)
 {
-  PTR ret;
+  void *ret;
 
   if (size != (size_t) size)
     {
@@ -186,9 +170,9 @@ bfd_realloc (ptr, size)
     }
 
   if (ptr == NULL)
-    ret = (PTR) malloc ((size_t) size);
+    ret = malloc ((size_t) size);
   else
-    ret = (PTR) realloc (ptr, (size_t) size);
+    ret = realloc (ptr, (size_t) size);
 
   if (ret == NULL && (size_t) size != 0)
     bfd_set_error (bfd_error_no_memory);
@@ -198,11 +182,10 @@ bfd_realloc (ptr, size)
 
 /* Allocate memory using malloc and clear it.  */
 
-PTR
-bfd_zmalloc (size)
-     bfd_size_type size;
+void *
+bfd_zmalloc (bfd_size_type size)
 {
-  PTR ptr;
+  void *ptr;
 
   if (size != (size_t) size)
     {
@@ -210,7 +193,7 @@ bfd_zmalloc (size)
       return NULL;
     }
 
-  ptr = (PTR) malloc ((size_t) size);
+  ptr = malloc ((size_t) size);
 
   if ((size_t) size != 0)
     {
@@ -222,378 +205,12 @@ bfd_zmalloc (size)
 
   return ptr;
 }
-
-/* Some IO code */
-
-/* Note that archive entries don't have streams; they share their parent's.
-   This allows someone to play with the iostream behind BFD's back.
-
-   Also, note that the origin pointer points to the beginning of a file's
-   contents (0 for non-archive elements).  For archive entries this is the
-   first octet in the file, NOT the beginning of the archive header.  */
-
-static size_t
-real_read (where, a, b, file)
-     PTR where;
-     size_t a;
-     size_t b;
-     FILE *file;
-{
-  /* FIXME - this looks like an optimization, but it's really to cover
-     up for a feature of some OSs (not solaris - sigh) that
-     ld/pe-dll.c takes advantage of (apparently) when it creates BFDs
-     internally and tries to link against them.  BFD seems to be smart
-     enough to realize there are no symbol records in the "file" that
-     doesn't exist but attempts to read them anyway.  On Solaris,
-     attempting to read zero bytes from a NULL file results in a core
-     dump, but on other platforms it just returns zero bytes read.
-     This makes it to something reasonable. - DJ */
-  if (a == 0 || b == 0)
-    return 0;
-
-
-#if defined (__VAX) && defined (VMS)
-  /* Apparently fread on Vax VMS does not keep the record length
-     information.  */
-  return read (fileno (file), where, a * b);
-#else
-  return fread (where, a, b, file);
-#endif
-}
-
-/* Return value is amount read.  */
-
-bfd_size_type
-bfd_bread (ptr, size, abfd)
-     PTR ptr;
-     bfd_size_type size;
-     bfd *abfd;
-{
-  size_t nread;
-
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    {
-      struct bfd_in_memory *bim;
-      bfd_size_type get;
-
-      bim = (struct bfd_in_memory *) abfd->iostream;
-      get = size;
-      if (abfd->where + get > bim->size)
-	{
-	  if (bim->size < (bfd_size_type) abfd->where)
-	    get = 0;
-	  else
-	    get = bim->size - abfd->where;
-	  bfd_set_error (bfd_error_file_truncated);
-	}
-      memcpy (ptr, bim->buffer + abfd->where, (size_t) get);
-      abfd->where += get;
-      return get;
-    }
-
-  nread = real_read (ptr, 1, (size_t) size, bfd_cache_lookup (abfd));
-  if (nread != (size_t) -1)
-    abfd->where += nread;
-
-  /* Set bfd_error if we did not read as much data as we expected.
-
-     If the read failed due to an error set the bfd_error_system_call,
-     else set bfd_error_file_truncated.
-
-     A BFD backend may wish to override bfd_error_file_truncated to
-     provide something more useful (eg. no_symbols or wrong_format).  */
-  if (nread != size)
-    {
-      if (ferror (bfd_cache_lookup (abfd)))
-	bfd_set_error (bfd_error_system_call);
-      else
-	bfd_set_error (bfd_error_file_truncated);
-    }
-
-  return nread;
-}
-
-/* The window support stuff should probably be broken out into
-   another file....  */
-/* The idea behind the next and refcount fields is that one mapped
-   region can suffice for multiple read-only windows or multiple
-   non-overlapping read-write windows.  It's not implemented yet
-   though.  */
-struct _bfd_window_internal {
-  struct _bfd_window_internal *next;
-  PTR data;
-  bfd_size_type size;
-  int refcount : 31;		/* should be enough...  */
-  unsigned mapped : 1;		/* 1 = mmap, 0 = malloc */
-};
-
-void
-bfd_init_window (windowp)
-     bfd_window *windowp;
-{
-  windowp->data = 0;
-  windowp->i = 0;
-  windowp->size = 0;
-}
-
-/* Currently, if USE_MMAP is undefined, none if the window stuff is
-   used.  Okay, so it's mis-named.  At least the command-line option
-   "--without-mmap" is more obvious than "--without-windows" or some
-   such.  */
-#ifdef USE_MMAP
-
-#undef HAVE_MPROTECT /* code's not tested yet */
-
-#if HAVE_MMAP || HAVE_MPROTECT || HAVE_MADVISE
-#include <sys/mman.h>
-#endif
-
-#ifndef MAP_FILE
-#define MAP_FILE 0
-#endif
-
-static int debug_windows;
-
-void
-bfd_free_window (windowp)
-     bfd_window *windowp;
-{
-  bfd_window_internal *i = windowp->i;
-  windowp->i = 0;
-  windowp->data = 0;
-  if (i == 0)
-    return;
-  i->refcount--;
-  if (debug_windows)
-    fprintf (stderr, "freeing window @%p<%p,%lx,%p>\n",
-	     windowp, windowp->data, windowp->size, windowp->i);
-  if (i->refcount != 0)
-    return;
-
-  if (i->mapped)
-    {
-#ifdef HAVE_MMAP
-      munmap (i->data, i->size);
-      goto no_free;
-#else
-      abort ();
-#endif
-    }
-#ifdef HAVE_MPROTECT
-  mprotect (i->data, i->size, PROT_READ | PROT_WRITE);
-#endif
-  free (i->data);
-#ifdef HAVE_MMAP
- no_free:
-#endif
-  i->data = 0;
-  /* There should be no more references to i at this point.  */
-  free (i);
-}
-
-static int ok_to_map = 1;
-
-boolean
-bfd_get_file_window (abfd, offset, size, windowp, writable)
-     bfd *abfd;
-     file_ptr offset;
-     bfd_size_type size;
-     bfd_window *windowp;
-     boolean writable;
-{
-  static size_t pagesize;
-  bfd_window_internal *i = windowp->i;
-  bfd_size_type size_to_alloc = size;
-
-  if (debug_windows)
-    fprintf (stderr, "bfd_get_file_window (%p, %6ld, %6ld, %p<%p,%lx,%p>, %d)",
-	     abfd, (long) offset, (long) size,
-	     windowp, windowp->data, (unsigned long) windowp->size,
-	     windowp->i, writable);
-
-  /* Make sure we know the page size, so we can be friendly to mmap.  */
-  if (pagesize == 0)
-    pagesize = getpagesize ();
-  if (pagesize == 0)
-    abort ();
-
-  if (i == 0)
-    {
-      i = ((bfd_window_internal *)
-	   bfd_zmalloc ((bfd_size_type) sizeof (bfd_window_internal)));
-      windowp->i = i;
-      if (i == 0)
-	return false;
-      i->data = 0;
-    }
-#ifdef HAVE_MMAP
-  if (ok_to_map
-      && (i->data == 0 || i->mapped == 1)
-      && (abfd->flags & BFD_IN_MEMORY) == 0)
-    {
-      file_ptr file_offset, offset2;
-      size_t real_size;
-      int fd;
-      FILE *f;
-
-      /* Find the real file and the real offset into it.  */
-      while (abfd->my_archive != NULL)
-	{
-	  offset += abfd->origin;
-	  abfd = abfd->my_archive;
-	}
-      f = bfd_cache_lookup (abfd);
-      fd = fileno (f);
-
-      /* Compute offsets and size for mmap and for the user's data.  */
-      offset2 = offset % pagesize;
-      if (offset2 < 0)
-	abort ();
-      file_offset = offset - offset2;
-      real_size = offset + size - file_offset;
-      real_size = real_size + pagesize - 1;
-      real_size -= real_size % pagesize;
-
-      /* If we're re-using a memory region, make sure it's big enough.  */
-      if (i->data && i->size < size)
-	{
-	  munmap (i->data, i->size);
-	  i->data = 0;
-	}
-      i->data = mmap (i->data, real_size,
-		      writable ? PROT_WRITE | PROT_READ : PROT_READ,
-		      (writable
-		       ? MAP_FILE | MAP_PRIVATE
-		       : MAP_FILE | MAP_SHARED),
-		      fd, file_offset);
-      if (i->data == (PTR) -1)
-	{
-	  /* An error happened.  Report it, or try using malloc, or
-	     something.  */
-	  bfd_set_error (bfd_error_system_call);
-	  i->data = 0;
-	  windowp->data = 0;
-	  if (debug_windows)
-	    fprintf (stderr, "\t\tmmap failed!\n");
-	  return false;
-	}
-      if (debug_windows)
-	fprintf (stderr, "\n\tmapped %ld at %p, offset is %ld\n",
-		 (long) real_size, i->data, (long) offset2);
-      i->size = real_size;
-      windowp->data = (PTR) ((bfd_byte *) i->data + offset2);
-      windowp->size = size;
-      i->mapped = 1;
-      return true;
-    }
-  else if (debug_windows)
-    {
-      if (ok_to_map)
-	fprintf (stderr, _("not mapping: data=%lx mapped=%d\n"),
-		 (unsigned long) i->data, (int) i->mapped);
-      else
-	fprintf (stderr, _("not mapping: env var not set\n"));
-    }
-#else
-  ok_to_map = 0;
-#endif
-
-#ifdef HAVE_MPROTECT
-  if (!writable)
-    {
-      size_to_alloc += pagesize - 1;
-      size_to_alloc -= size_to_alloc % pagesize;
-    }
-#endif
-  if (debug_windows)
-    fprintf (stderr, "\n\t%s(%6ld)",
-	     i->data ? "realloc" : " malloc", (long) size_to_alloc);
-  i->data = (PTR) bfd_realloc (i->data, size_to_alloc);
-  if (debug_windows)
-    fprintf (stderr, "\t-> %p\n", i->data);
-  i->refcount = 1;
-  if (i->data == NULL)
-    {
-      if (size_to_alloc == 0)
-	return true;
-      return false;
-    }
-  if (bfd_seek (abfd, offset, SEEK_SET) != 0)
-    return false;
-  i->size = bfd_bread (i->data, size, abfd);
-  if (i->size != size)
-    return false;
-  i->mapped = 0;
-#ifdef HAVE_MPROTECT
-  if (!writable)
-    {
-      if (debug_windows)
-	fprintf (stderr, "\tmprotect (%p, %ld, PROT_READ)\n", i->data,
-		 (long) i->size);
-      mprotect (i->data, i->size, PROT_READ);
-    }
-#endif
-  windowp->data = i->data;
-  windowp->size = i->size;
-  return true;
-}
-
-#endif /* USE_MMAP */
-
-bfd_size_type
-bfd_bwrite (ptr, size, abfd)
-     const PTR ptr;
-     bfd_size_type size;
-     bfd *abfd;
-{
-  size_t nwrote;
-
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    {
-      struct bfd_in_memory *bim = (struct bfd_in_memory *) (abfd->iostream);
-      size = (size_t) size;
-      if (abfd->where + size > bim->size)
-	{
-	  bfd_size_type newsize, oldsize;
-
-	  oldsize = (bim->size + 127) & ~(bfd_size_type) 127;
-	  bim->size = abfd->where + size;
-	  /* Round up to cut down on memory fragmentation */
-	  newsize = (bim->size + 127) & ~(bfd_size_type) 127;
-	  if (newsize > oldsize)
-	    {
-	      bim->buffer = (bfd_byte *) bfd_realloc (bim->buffer, newsize);
-	      if (bim->buffer == 0)
-		{
-		  bim->size = 0;
-		  return 0;
-		}
-	    }
-	}
-      memcpy (bim->buffer + abfd->where, ptr, (size_t) size);
-      abfd->where += size;
-      return size;
-    }
-
-  nwrote = fwrite (ptr, 1, (size_t) size, bfd_cache_lookup (abfd));
-  if (nwrote != (size_t) -1)
-    abfd->where += nwrote;
-  if (nwrote != size)
-    {
-#ifdef ENOSPC
-      errno = ENOSPC;
-#endif
-      bfd_set_error (bfd_error_system_call);
-    }
-  return nwrote;
-}
-
 /*
 INTERNAL_FUNCTION
 	bfd_write_bigendian_4byte_int
 
 SYNOPSIS
-	boolean bfd_write_bigendian_4byte_int (bfd *, unsigned int);
+	bfd_boolean bfd_write_bigendian_4byte_int (bfd *, unsigned int);
 
 DESCRIPTION
 	Write a 4 byte integer @var{i} to the output BFD @var{abfd}, in big
@@ -601,196 +218,14 @@ DESCRIPTION
 	archives.
 
 */
-boolean
-bfd_write_bigendian_4byte_int (abfd, i)
-     bfd *abfd;
-     unsigned int i;
+bfd_boolean
+bfd_write_bigendian_4byte_int (bfd *abfd, unsigned int i)
 {
   bfd_byte buffer[4];
   bfd_putb32 ((bfd_vma) i, buffer);
-  return (boolean) (bfd_bwrite ((PTR) buffer, (bfd_size_type) 4, abfd) == 4);
-}
-
-bfd_vma
-bfd_tell (abfd)
-     bfd *abfd;
-{
-  file_ptr ptr;
-
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    return abfd->where;
-
-  ptr = ftell (bfd_cache_lookup (abfd));
-
-  if (abfd->my_archive)
-    ptr -= abfd->origin;
-  abfd->where = ptr;
-  return ptr;
-}
-
-int
-bfd_flush (abfd)
-     bfd *abfd;
-{
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    return 0;
-  return fflush (bfd_cache_lookup(abfd));
-}
-
-/* Returns 0 for success, negative value for failure (in which case
-   bfd_get_error can retrieve the error code).  */
-int
-bfd_stat (abfd, statbuf)
-     bfd *abfd;
-     struct stat *statbuf;
-{
-  FILE *f;
-  int result;
-
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    abort ();
-
-  f = bfd_cache_lookup (abfd);
-  if (f == NULL)
-    {
-      bfd_set_error (bfd_error_system_call);
-      return -1;
-    }
-  result = fstat (fileno (f), statbuf);
-  if (result < 0)
-    bfd_set_error (bfd_error_system_call);
-  return result;
+  return bfd_bwrite (buffer, (bfd_size_type) 4, abfd) == 4;
 }
 
-/* Returns 0 for success, nonzero for failure (in which case bfd_get_error
-   can retrieve the error code).  */
-
-int
-bfd_seek (abfd, position, direction)
-     bfd *abfd;
-     file_ptr position;
-     int direction;
-{
-  int result;
-  FILE *f;
-  long file_position;
-  /* For the time being, a BFD may not seek to it's end.  The problem
-     is that we don't easily have a way to recognize the end of an
-     element in an archive.  */
-
-  BFD_ASSERT (direction == SEEK_SET || direction == SEEK_CUR);
-
-  if (direction == SEEK_CUR && position == 0)
-    return 0;
-
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    {
-      struct bfd_in_memory *bim;
-
-      bim = (struct bfd_in_memory *) abfd->iostream;
-
-      if (direction == SEEK_SET)
-	abfd->where = position;
-      else
-	abfd->where += position;
-
-      if (abfd->where > bim->size)
-	{
-	  if ((abfd->direction == write_direction) ||
-	      (abfd->direction == both_direction))
-	    {
-	      bfd_size_type newsize, oldsize;
-	      oldsize = (bim->size + 127) & ~(bfd_size_type) 127;
-	      bim->size = abfd->where;
-	      /* Round up to cut down on memory fragmentation */
-	      newsize = (bim->size + 127) & ~(bfd_size_type) 127;
-	      if (newsize > oldsize)
-	        {
-		  bim->buffer = (bfd_byte *) bfd_realloc (bim->buffer, newsize);
-		  if (bim->buffer == 0)
-		    {
-		      bim->size = 0;
-		      return -1;
-		    }
-	        }
-	    }
-	  else
-	    {
-	      abfd->where = bim->size;
-	      bfd_set_error (bfd_error_file_truncated);
-	      return -1;
-	    }
-	}
-      return 0;
-    }
-
-  if (abfd->format != bfd_archive && abfd->my_archive == 0)
-    {
-#if 0
-      /* Explanation for this code: I'm only about 95+% sure that the above
-	 conditions are sufficient and that all i/o calls are properly
-	 adjusting the `where' field.  So this is sort of an `assert'
-	 that the `where' field is correct.  If we can go a while without
-	 tripping the abort, we can probably safely disable this code,
-	 so that the real optimizations happen.  */
-      file_ptr where_am_i_now;
-      where_am_i_now = ftell (bfd_cache_lookup (abfd));
-      if (abfd->my_archive)
-	where_am_i_now -= abfd->origin;
-      if (where_am_i_now != abfd->where)
-	abort ();
-#endif
-      if (direction == SEEK_SET && (bfd_vma) position == abfd->where)
-	return 0;
-    }
-  else
-    {
-      /* We need something smarter to optimize access to archives.
-	 Currently, anything inside an archive is read via the file
-	 handle for the archive.  Which means that a bfd_seek on one
-	 component affects the `current position' in the archive, as
-	 well as in any other component.
-
-	 It might be sufficient to put a spike through the cache
-	 abstraction, and look to the archive for the file position,
-	 but I think we should try for something cleaner.
-
-	 In the meantime, no optimization for archives.  */
-    }
-
-  f = bfd_cache_lookup (abfd);
-  file_position = position;
-  if (direction == SEEK_SET && abfd->my_archive != NULL)
-    file_position += abfd->origin;
-
-  result = fseek (f, file_position, direction);
-  if (result != 0)
-    {
-      int hold_errno = errno;
-
-      /* Force redetermination of `where' field.  */
-      bfd_tell (abfd);
-
-      /* An EINVAL error probably means that the file offset was
-         absurd.  */
-      if (hold_errno == EINVAL)
-	bfd_set_error (bfd_error_file_truncated);
-      else
-	{
-	  bfd_set_error (bfd_error_system_call);
-	  errno = hold_errno;
-	}
-    }
-  else
-    {
-      /* Adjust `where' field.  */
-      if (direction == SEEK_SET)
-	abfd->where = position;
-      else
-	abfd->where += position;
-    }
-  return result;
-}
 
 /** The do-it-yourself (byte) sex-change kit */
 
@@ -831,54 +266,54 @@ DESCRIPTION
 .{* Byte swapping macros for user section data.  *}
 .
 .#define bfd_put_8(abfd, val, ptr) \
-.                ((void) (*((unsigned char *) (ptr)) = (unsigned char) (val)))
+.  ((void) (*((unsigned char *) (ptr)) = (val) & 0xff))
 .#define bfd_put_signed_8 \
-.		bfd_put_8
+.  bfd_put_8
 .#define bfd_get_8(abfd, ptr) \
-.                (*(unsigned char *) (ptr) & 0xff)
+.  (*(unsigned char *) (ptr) & 0xff)
 .#define bfd_get_signed_8(abfd, ptr) \
-.		(((*(unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80)
+.  (((*(unsigned char *) (ptr) & 0xff) ^ 0x80) - 0x80)
 .
 .#define bfd_put_16(abfd, val, ptr) \
-.                BFD_SEND(abfd, bfd_putx16, ((val),(ptr)))
+.  BFD_SEND (abfd, bfd_putx16, ((val),(ptr)))
 .#define bfd_put_signed_16 \
-.		 bfd_put_16
+.  bfd_put_16
 .#define bfd_get_16(abfd, ptr) \
-.                BFD_SEND(abfd, bfd_getx16, (ptr))
+.  BFD_SEND (abfd, bfd_getx16, (ptr))
 .#define bfd_get_signed_16(abfd, ptr) \
-.         	 BFD_SEND (abfd, bfd_getx_signed_16, (ptr))
+.  BFD_SEND (abfd, bfd_getx_signed_16, (ptr))
 .
 .#define bfd_put_32(abfd, val, ptr) \
-.                BFD_SEND(abfd, bfd_putx32, ((val),(ptr)))
+.  BFD_SEND (abfd, bfd_putx32, ((val),(ptr)))
 .#define bfd_put_signed_32 \
-.		 bfd_put_32
+.  bfd_put_32
 .#define bfd_get_32(abfd, ptr) \
-.                BFD_SEND(abfd, bfd_getx32, (ptr))
+.  BFD_SEND (abfd, bfd_getx32, (ptr))
 .#define bfd_get_signed_32(abfd, ptr) \
-.		 BFD_SEND(abfd, bfd_getx_signed_32, (ptr))
+.  BFD_SEND (abfd, bfd_getx_signed_32, (ptr))
 .
 .#define bfd_put_64(abfd, val, ptr) \
-.                BFD_SEND(abfd, bfd_putx64, ((val), (ptr)))
+.  BFD_SEND (abfd, bfd_putx64, ((val), (ptr)))
 .#define bfd_put_signed_64 \
-.		 bfd_put_64
+.  bfd_put_64
 .#define bfd_get_64(abfd, ptr) \
-.                BFD_SEND(abfd, bfd_getx64, (ptr))
+.  BFD_SEND (abfd, bfd_getx64, (ptr))
 .#define bfd_get_signed_64(abfd, ptr) \
-.		 BFD_SEND(abfd, bfd_getx_signed_64, (ptr))
+.  BFD_SEND (abfd, bfd_getx_signed_64, (ptr))
 .
-.#define bfd_get(bits, abfd, ptr)				\
-.                ( (bits) ==  8 ? (bfd_vma) bfd_get_8 (abfd, ptr)	\
-.		 : (bits) == 16 ? bfd_get_16 (abfd, ptr)	\
-.		 : (bits) == 32 ? bfd_get_32 (abfd, ptr)	\
-.		 : (bits) == 64 ? bfd_get_64 (abfd, ptr)	\
-.		 : (abort (), (bfd_vma) - 1))
+.#define bfd_get(bits, abfd, ptr)			\
+.  ((bits) == 8 ? (bfd_vma) bfd_get_8 (abfd, ptr)	\
+.   : (bits) == 16 ? bfd_get_16 (abfd, ptr)		\
+.   : (bits) == 32 ? bfd_get_32 (abfd, ptr)		\
+.   : (bits) == 64 ? bfd_get_64 (abfd, ptr)		\
+.   : (abort (), (bfd_vma) - 1))
 .
-.#define bfd_put(bits, abfd, val, ptr)				\
-.                ( (bits) ==  8 ? bfd_put_8  (abfd, val, ptr)	\
-.		 : (bits) == 16 ? bfd_put_16 (abfd, val, ptr)	\
-.		 : (bits) == 32 ? bfd_put_32 (abfd, val, ptr)	\
-.		 : (bits) == 64 ? bfd_put_64 (abfd, val, ptr)	\
-.		 : (abort (), (void) 0))
+.#define bfd_put(bits, abfd, val, ptr)			\
+.  ((bits) == 8 ? bfd_put_8  (abfd, val, ptr)		\
+.   : (bits) == 16 ? bfd_put_16 (abfd, val, ptr)		\
+.   : (bits) == 32 ? bfd_put_32 (abfd, val, ptr)		\
+.   : (bits) == 64 ? bfd_put_64 (abfd, val, ptr)		\
+.   : (abort (), (void) 0))
 .
 */
 
@@ -932,139 +367,108 @@ DESCRIPTION
 .#define bfd_h_get_signed_64(abfd, ptr) \
 .  BFD_SEND (abfd, bfd_h_getx_signed_64, (ptr))
 .
-.{* Refinements on the above, which should eventually go away.  Save
-.   cluttering the source with (bfd_vma) and (bfd_byte *) casts.  *}
-.
-.#define H_PUT_64(abfd, val, where) \
-.  bfd_h_put_64 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
-.
-.#define H_PUT_32(abfd, val, where) \
-.  bfd_h_put_32 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
-.
-.#define H_PUT_16(abfd, val, where) \
-.  bfd_h_put_16 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
-.
-.#define H_PUT_8 bfd_h_put_8
-.
-.#define H_PUT_S64(abfd, val, where) \
-.  bfd_h_put_signed_64 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+.{* Aliases for the above, which should eventually go away.  *}
 .
-.#define H_PUT_S32(abfd, val, where) \
-.  bfd_h_put_signed_32 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
-.
-.#define H_PUT_S16(abfd, val, where) \
-.  bfd_h_put_signed_16 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
-.
-.#define H_PUT_S8 bfd_h_put_signed_8
-.
-.#define H_GET_64(abfd, where) \
-.  bfd_h_get_64 ((abfd), (bfd_byte *) (where))
-.
-.#define H_GET_32(abfd, where) \
-.  bfd_h_get_32 ((abfd), (bfd_byte *) (where))
-.
-.#define H_GET_16(abfd, where) \
-.  bfd_h_get_16 ((abfd), (bfd_byte *) (where))
-.
-.#define H_GET_8 bfd_h_get_8
-.
-.#define H_GET_S64(abfd, where) \
-.  bfd_h_get_signed_64 ((abfd), (bfd_byte *) (where))
-.
-.#define H_GET_S32(abfd, where) \
-.  bfd_h_get_signed_32 ((abfd), (bfd_byte *) (where))
-.
-.#define H_GET_S16(abfd, where) \
-.  bfd_h_get_signed_16 ((abfd), (bfd_byte *) (where))
-.
-.#define H_GET_S8 bfd_h_get_signed_8
+.#define H_PUT_64  bfd_h_put_64
+.#define H_PUT_32  bfd_h_put_32
+.#define H_PUT_16  bfd_h_put_16
+.#define H_PUT_8   bfd_h_put_8
+.#define H_PUT_S64 bfd_h_put_signed_64
+.#define H_PUT_S32 bfd_h_put_signed_32
+.#define H_PUT_S16 bfd_h_put_signed_16
+.#define H_PUT_S8  bfd_h_put_signed_8
+.#define H_GET_64  bfd_h_get_64
+.#define H_GET_32  bfd_h_get_32
+.#define H_GET_16  bfd_h_get_16
+.#define H_GET_8   bfd_h_get_8
+.#define H_GET_S64 bfd_h_get_signed_64
+.#define H_GET_S32 bfd_h_get_signed_32
+.#define H_GET_S16 bfd_h_get_signed_16
+.#define H_GET_S8  bfd_h_get_signed_8
 .
 .*/
 
 /* Sign extension to bfd_signed_vma.  */
 #define COERCE16(x) (((bfd_signed_vma) (x) ^ 0x8000) - 0x8000)
-#define COERCE32(x) \
-  ((bfd_signed_vma) (long) (((unsigned long) (x) ^ 0x80000000) - 0x80000000))
-#define EIGHT_GAZILLION (((BFD_HOST_64_BIT)0x80000000) << 32)
+#define COERCE32(x) (((bfd_signed_vma) (x) ^ 0x80000000) - 0x80000000)
+#define EIGHT_GAZILLION ((bfd_int64_t) 1 << 63)
 #define COERCE64(x) \
-  (((bfd_signed_vma) (x) ^ EIGHT_GAZILLION) - EIGHT_GAZILLION)
+  (((bfd_int64_t) (x) ^ EIGHT_GAZILLION) - EIGHT_GAZILLION)
 
 bfd_vma
-bfd_getb16 (addr)
-     register const bfd_byte *addr;
+bfd_getb16 (const void *p)
 {
+  const bfd_byte *addr = p;
   return (addr[0] << 8) | addr[1];
 }
 
 bfd_vma
-bfd_getl16 (addr)
-     register const bfd_byte *addr;
+bfd_getl16 (const void *p)
 {
+  const bfd_byte *addr = p;
   return (addr[1] << 8) | addr[0];
 }
 
 bfd_signed_vma
-bfd_getb_signed_16 (addr)
-     register const bfd_byte *addr;
+bfd_getb_signed_16 (const void *p)
 {
-  return COERCE16((addr[0] << 8) | addr[1]);
+  const bfd_byte *addr = p;
+  return COERCE16 ((addr[0] << 8) | addr[1]);
 }
 
 bfd_signed_vma
-bfd_getl_signed_16 (addr)
-     register const bfd_byte *addr;
+bfd_getl_signed_16 (const void *p)
 {
-  return COERCE16((addr[1] << 8) | addr[0]);
+  const bfd_byte *addr = p;
+  return COERCE16 ((addr[1] << 8) | addr[0]);
 }
 
 void
-bfd_putb16 (data, addr)
-     bfd_vma data;
-     register bfd_byte *addr;
+bfd_putb16 (bfd_vma data, void *p)
 {
-  addr[0] = (bfd_byte) (data >> 8);
-  addr[1] = (bfd_byte) data;
+  bfd_byte *addr = p;
+  addr[0] = (data >> 8) & 0xff;
+  addr[1] = data & 0xff;
 }
 
 void
-bfd_putl16 (data, addr)
-     bfd_vma data;
-     register bfd_byte *addr;
+bfd_putl16 (bfd_vma data, void *p)
 {
-  addr[0] = (bfd_byte) data;
-  addr[1] = (bfd_byte) (data >> 8);
+  bfd_byte *addr = p;
+  addr[0] = data & 0xff;
+  addr[1] = (data >> 8) & 0xff;
 }
 
 bfd_vma
-bfd_getb32 (addr)
-     register const bfd_byte *addr;
+bfd_getb32 (const void *p)
 {
+  const bfd_byte *addr = p;
   unsigned long v;
 
   v = (unsigned long) addr[0] << 24;
   v |= (unsigned long) addr[1] << 16;
   v |= (unsigned long) addr[2] << 8;
   v |= (unsigned long) addr[3];
-  return (bfd_vma) v;
+  return v;
 }
 
 bfd_vma
-bfd_getl32 (addr)
-     register const bfd_byte *addr;
+bfd_getl32 (const void *p)
 {
+  const bfd_byte *addr = p;
   unsigned long v;
 
   v = (unsigned long) addr[0];
   v |= (unsigned long) addr[1] << 8;
   v |= (unsigned long) addr[2] << 16;
   v |= (unsigned long) addr[3] << 24;
-  return (bfd_vma) v;
+  return v;
 }
 
 bfd_signed_vma
-bfd_getb_signed_32 (addr)
-     register const bfd_byte *addr;
+bfd_getb_signed_32 (const void *p)
 {
+  const bfd_byte *addr = p;
   unsigned long v;
 
   v = (unsigned long) addr[0] << 24;
@@ -1075,9 +479,9 @@ bfd_getb_signed_32 (addr)
 }
 
 bfd_signed_vma
-bfd_getl_signed_32 (addr)
-     register const bfd_byte *addr;
+bfd_getl_signed_32 (const void *p)
 {
+  const bfd_byte *addr = p;
   unsigned long v;
 
   v = (unsigned long) addr[0];
@@ -1087,47 +491,46 @@ bfd_getl_signed_32 (addr)
   return COERCE32 (v);
 }
 
-bfd_vma
-bfd_getb64 (addr)
-     register const bfd_byte *addr ATTRIBUTE_UNUSED;
+bfd_uint64_t
+bfd_getb64 (const void *p ATTRIBUTE_UNUSED)
 {
-#ifdef BFD64
-  bfd_vma low, high;
-
-  high= ((((((((addr[0]) << 8) |
-              addr[1]) << 8) |
-            addr[2]) << 8) |
-          addr[3]) );
+#ifdef BFD_HOST_64_BIT
+  const bfd_byte *addr = p;
+  bfd_uint64_t v;
 
-  low = (((((((((bfd_vma)addr[4]) << 8) |
-              addr[5]) << 8) |
-            addr[6]) << 8) |
-          addr[7]));
+  v  = addr[0]; v <<= 8;
+  v |= addr[1]; v <<= 8;
+  v |= addr[2]; v <<= 8;
+  v |= addr[3]; v <<= 8;
+  v |= addr[4]; v <<= 8;
+  v |= addr[5]; v <<= 8;
+  v |= addr[6]; v <<= 8;
+  v |= addr[7];
 
-  return high << 32 | low;
+  return v;
 #else
   BFD_FAIL();
   return 0;
 #endif
 }
 
-bfd_vma
-bfd_getl64 (addr)
-     register const bfd_byte *addr ATTRIBUTE_UNUSED;
+bfd_uint64_t
+bfd_getl64 (const void *p ATTRIBUTE_UNUSED)
 {
-#ifdef BFD64
-  bfd_vma low, high;
-  high= (((((((addr[7] << 8) |
-              addr[6]) << 8) |
-            addr[5]) << 8) |
-          addr[4]));
-
-  low = ((((((((bfd_vma)addr[3] << 8) |
-              addr[2]) << 8) |
-            addr[1]) << 8) |
-          addr[0]) );
-
-  return high << 32 | low;
+#ifdef BFD_HOST_64_BIT
+  const bfd_byte *addr = p;
+  bfd_uint64_t v;
+
+  v  = addr[7]; v <<= 8;
+  v |= addr[6]; v <<= 8;
+  v |= addr[5]; v <<= 8;
+  v |= addr[4]; v <<= 8;
+  v |= addr[3]; v <<= 8;
+  v |= addr[2]; v <<= 8;
+  v |= addr[1]; v <<= 8;
+  v |= addr[0];
+
+  return v;
 #else
   BFD_FAIL();
   return 0;
@@ -1135,47 +538,46 @@ bfd_getl64 (addr)
 
 }
 
-bfd_signed_vma
-bfd_getb_signed_64 (addr)
-     register const bfd_byte *addr ATTRIBUTE_UNUSED;
+bfd_int64_t
+bfd_getb_signed_64 (const void *p ATTRIBUTE_UNUSED)
 {
-#ifdef BFD64
-  bfd_vma low, high;
-
-  high= ((((((((addr[0]) << 8) |
-              addr[1]) << 8) |
-            addr[2]) << 8) |
-          addr[3]) );
+#ifdef BFD_HOST_64_BIT
+  const bfd_byte *addr = p;
+  bfd_uint64_t v;
 
-  low = (((((((((bfd_vma)addr[4]) << 8) |
-              addr[5]) << 8) |
-            addr[6]) << 8) |
-          addr[7]));
+  v  = addr[0]; v <<= 8;
+  v |= addr[1]; v <<= 8;
+  v |= addr[2]; v <<= 8;
+  v |= addr[3]; v <<= 8;
+  v |= addr[4]; v <<= 8;
+  v |= addr[5]; v <<= 8;
+  v |= addr[6]; v <<= 8;
+  v |= addr[7];
 
-  return COERCE64(high << 32 | low);
+  return COERCE64 (v);
 #else
   BFD_FAIL();
   return 0;
 #endif
 }
 
-bfd_signed_vma
-bfd_getl_signed_64 (addr)
-     register const bfd_byte *addr ATTRIBUTE_UNUSED;
+bfd_int64_t
+bfd_getl_signed_64 (const void *p ATTRIBUTE_UNUSED)
 {
-#ifdef BFD64
-  bfd_vma low, high;
-  high= (((((((addr[7] << 8) |
-              addr[6]) << 8) |
-            addr[5]) << 8) |
-          addr[4]));
-
-  low = ((((((((bfd_vma)addr[3] << 8) |
-              addr[2]) << 8) |
-            addr[1]) << 8) |
-          addr[0]) );
-
-  return COERCE64(high << 32 | low);
+#ifdef BFD_HOST_64_BIT
+  const bfd_byte *addr = p;
+  bfd_uint64_t v;
+
+  v  = addr[7]; v <<= 8;
+  v |= addr[6]; v <<= 8;
+  v |= addr[5]; v <<= 8;
+  v |= addr[4]; v <<= 8;
+  v |= addr[3]; v <<= 8;
+  v |= addr[2]; v <<= 8;
+  v |= addr[1]; v <<= 8;
+  v |= addr[0];
+
+  return COERCE64 (v);
 #else
   BFD_FAIL();
   return 0;
@@ -1183,72 +585,65 @@ bfd_getl_signed_64 (addr)
 }
 
 void
-bfd_putb32 (data, addr)
-     bfd_vma data;
-     register bfd_byte *addr;
+bfd_putb32 (bfd_vma data, void *p)
 {
-        addr[0] = (bfd_byte) (data >> 24);
-        addr[1] = (bfd_byte) (data >> 16);
-        addr[2] = (bfd_byte) (data >>  8);
-        addr[3] = (bfd_byte) data;
+  bfd_byte *addr = p;
+  addr[0] = (data >> 24) & 0xff;
+  addr[1] = (data >> 16) & 0xff;
+  addr[2] = (data >>  8) & 0xff;
+  addr[3] = data & 0xff;
 }
 
 void
-bfd_putl32 (data, addr)
-     bfd_vma data;
-     register bfd_byte *addr;
+bfd_putl32 (bfd_vma data, void *p)
 {
-        addr[0] = (bfd_byte) data;
-        addr[1] = (bfd_byte) (data >>  8);
-        addr[2] = (bfd_byte) (data >> 16);
-        addr[3] = (bfd_byte) (data >> 24);
+  bfd_byte *addr = p;
+  addr[0] = data & 0xff;
+  addr[1] = (data >>  8) & 0xff;
+  addr[2] = (data >> 16) & 0xff;
+  addr[3] = (data >> 24) & 0xff;
 }
 
 void
-bfd_putb64 (data, addr)
-     bfd_vma data ATTRIBUTE_UNUSED;
-     register bfd_byte *addr ATTRIBUTE_UNUSED;
-{
-#ifdef BFD64
-  addr[0] = (bfd_byte) (data >> (7*8));
-  addr[1] = (bfd_byte) (data >> (6*8));
-  addr[2] = (bfd_byte) (data >> (5*8));
-  addr[3] = (bfd_byte) (data >> (4*8));
-  addr[4] = (bfd_byte) (data >> (3*8));
-  addr[5] = (bfd_byte) (data >> (2*8));
-  addr[6] = (bfd_byte) (data >> (1*8));
-  addr[7] = (bfd_byte) (data >> (0*8));
+bfd_putb64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
+{
+#ifdef BFD_HOST_64_BIT
+  bfd_byte *addr = p;
+  addr[0] = (data >> (7*8)) & 0xff;
+  addr[1] = (data >> (6*8)) & 0xff;
+  addr[2] = (data >> (5*8)) & 0xff;
+  addr[3] = (data >> (4*8)) & 0xff;
+  addr[4] = (data >> (3*8)) & 0xff;
+  addr[5] = (data >> (2*8)) & 0xff;
+  addr[6] = (data >> (1*8)) & 0xff;
+  addr[7] = (data >> (0*8)) & 0xff;
 #else
   BFD_FAIL();
 #endif
 }
 
 void
-bfd_putl64 (data, addr)
-     bfd_vma data ATTRIBUTE_UNUSED;
-     register bfd_byte *addr ATTRIBUTE_UNUSED;
-{
-#ifdef BFD64
-  addr[7] = (bfd_byte) (data >> (7*8));
-  addr[6] = (bfd_byte) (data >> (6*8));
-  addr[5] = (bfd_byte) (data >> (5*8));
-  addr[4] = (bfd_byte) (data >> (4*8));
-  addr[3] = (bfd_byte) (data >> (3*8));
-  addr[2] = (bfd_byte) (data >> (2*8));
-  addr[1] = (bfd_byte) (data >> (1*8));
-  addr[0] = (bfd_byte) (data >> (0*8));
+bfd_putl64 (bfd_uint64_t data ATTRIBUTE_UNUSED, void *p ATTRIBUTE_UNUSED)
+{
+#ifdef BFD_HOST_64_BIT
+  bfd_byte *addr = p;
+  addr[7] = (data >> (7*8)) & 0xff;
+  addr[6] = (data >> (6*8)) & 0xff;
+  addr[5] = (data >> (5*8)) & 0xff;
+  addr[4] = (data >> (4*8)) & 0xff;
+  addr[3] = (data >> (3*8)) & 0xff;
+  addr[2] = (data >> (2*8)) & 0xff;
+  addr[1] = (data >> (1*8)) & 0xff;
+  addr[0] = (data >> (0*8)) & 0xff;
 #else
   BFD_FAIL();
 #endif
 }
 
 void
-bfd_put_bits (data, addr, bits, big_p)
-     bfd_vma data;
-     bfd_byte *addr;
-     int bits;
-     boolean big_p;
+bfd_put_bits (bfd_uint64_t data, void *p, int bits, bfd_boolean big_p)
 {
+  bfd_byte *addr = p;
   int i;
   int bytes;
 
@@ -1260,18 +655,16 @@ bfd_put_bits (data, addr, bits, big_p)
     {
       int index = big_p ? bytes - i - 1 : i;
 
-      addr[index] = (bfd_byte) data;
+      addr[index] = data & 0xff;
       data >>= 8;
     }
 }
 
-bfd_vma
-bfd_get_bits (addr, bits, big_p)
-     bfd_byte *addr;
-     int bits;
-     boolean big_p;
+bfd_uint64_t
+bfd_get_bits (const void *p, int bits, bfd_boolean big_p)
 {
-  bfd_vma data;
+  const bfd_byte *addr = p;
+  bfd_uint64_t data;
   int i;
   int bytes;
 
@@ -1292,42 +685,42 @@ bfd_get_bits (addr, bits, big_p)
 
 /* Default implementation */
 
-boolean
-_bfd_generic_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
+bfd_boolean
+_bfd_generic_get_section_contents (bfd *abfd,
+				   sec_ptr section,
+				   void *location,
+				   file_ptr offset,
+				   bfd_size_type count)
 {
   if (count == 0)
-    return true;
+    return TRUE;
 
   if (offset + count > section->_raw_size)
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
   if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
       || bfd_bread (location, count, abfd) != count)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
-boolean
-_bfd_generic_get_section_contents_in_window (abfd, section, w, offset, count)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     sec_ptr section ATTRIBUTE_UNUSED;
-     bfd_window *w ATTRIBUTE_UNUSED;
-     file_ptr offset ATTRIBUTE_UNUSED;
-     bfd_size_type count ATTRIBUTE_UNUSED;
+bfd_boolean
+_bfd_generic_get_section_contents_in_window
+  (bfd *abfd ATTRIBUTE_UNUSED,
+   sec_ptr section ATTRIBUTE_UNUSED,
+   bfd_window *w ATTRIBUTE_UNUSED,
+   file_ptr offset ATTRIBUTE_UNUSED,
+   bfd_size_type count ATTRIBUTE_UNUSED)
 {
 #ifdef USE_MMAP
   if (count == 0)
-    return true;
-  if (abfd->xvec->_bfd_get_section_contents != _bfd_generic_get_section_contents)
+    return TRUE;
+  if (abfd->xvec->_bfd_get_section_contents
+      != _bfd_generic_get_section_contents)
     {
       /* We don't know what changes the bfd's get_section_contents
 	 method may have to make.  So punt trying to map the file
@@ -1335,16 +728,15 @@ _bfd_generic_get_section_contents_in_window (abfd, section, w, offset, count)
       /* @@ FIXME : If the internal window has a refcount of 1 and was
 	 allocated with malloc instead of mmap, just reuse it.  */
       bfd_free_window (w);
-      w->i = ((bfd_window_internal *)
-	      bfd_zmalloc ((bfd_size_type) sizeof (bfd_window_internal)));
+      w->i = bfd_zmalloc (sizeof (bfd_window_internal));
       if (w->i == NULL)
-	return false;
-      w->i->data = (PTR) bfd_malloc (count);
+	return FALSE;
+      w->i->data = bfd_malloc (count);
       if (w->i->data == NULL)
 	{
 	  free (w->i);
 	  w->i = NULL;
-	  return false;
+	  return FALSE;
 	}
       w->i->mapped = 0;
       w->i->refcount = 1;
@@ -1354,9 +746,9 @@ _bfd_generic_get_section_contents_in_window (abfd, section, w, offset, count)
     }
   if (offset + count > section->_raw_size
       || ! bfd_get_file_window (abfd, section->filepos + offset, count, w,
-				true))
-    return false;
-  return true;
+				TRUE))
+    return FALSE;
+  return TRUE;
 #else
   abort ();
 #endif
@@ -1366,22 +758,21 @@ _bfd_generic_get_section_contents_in_window (abfd, section, w, offset, count)
    NEW sections is disallowed.  It is useful in patching existing sections
    in read-write files, though.  See other set_section_contents functions
    to see why it doesn't work for new sections.  */
-boolean
-_bfd_generic_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
+bfd_boolean
+_bfd_generic_set_section_contents (bfd *abfd,
+				   sec_ptr section,
+				   const void *location,
+				   file_ptr offset,
+				   bfd_size_type count)
 {
   if (count == 0)
-    return true;
+    return TRUE;
 
   if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
       || bfd_bwrite (location, count, abfd) != count)
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /*
@@ -1397,8 +788,7 @@ DESCRIPTION
 */
 
 unsigned int
-bfd_log2 (x)
-     bfd_vma x;
+bfd_log2 (bfd_vma x)
 {
   unsigned int result = 0;
 
@@ -1407,23 +797,19 @@ bfd_log2 (x)
   return result;
 }
 
-boolean
-bfd_generic_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
+bfd_boolean
+bfd_generic_is_local_label_name (bfd *abfd, const char *name)
 {
   char locals_prefix = (bfd_get_symbol_leading_char (abfd) == '_') ? 'L' : '.';
 
-  return (boolean) (name[0] == locals_prefix);
+  return name[0] == locals_prefix;
 }
 
 /*  Can be used from / for bfd_merge_private_bfd_data to check that
     endianness matches between input and output file.  Returns
-    true for a match, otherwise returns false and emits an error.  */
-boolean
-_bfd_generic_verify_endian_match (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
+    TRUE for a match, otherwise returns FALSE and emits an error.  */
+bfd_boolean
+_bfd_generic_verify_endian_match (bfd *ibfd, bfd *obfd)
 {
   if (ibfd->xvec->byteorder != obfd->xvec->byteorder
       && ibfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN
@@ -1439,28 +825,27 @@ _bfd_generic_verify_endian_match (ibfd, obfd)
       (*_bfd_error_handler) (msg, bfd_archive_filename (ibfd));
 
       bfd_set_error (bfd_error_wrong_format);
-      return false;
+      return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Give a warning at runtime if someone compiles code which calls
    old routines.  */
 
 void
-warn_deprecated (what, file, line, func)
-     const char *what;
-     const char *file;
-     int line;
-     const char *func;
+warn_deprecated (const char *what,
+		 const char *file,
+		 int line,
+		 const char *func)
 {
   /* Poor man's tracking of functions we've already warned about.  */
   static size_t mask = 0;
 
   if (~(size_t) func & ~mask)
     {
-      /* Note: seperate sentances in order to allow
+      /* Note: separate sentences in order to allow
 	 for translation into other languages.  */
       if (func)
 	fprintf (stderr, _("Deprecated %s called at %s line %d in %s\n"),