Merge GDB 7.5.1

bfd/oasys.c

 /* BFD back-end for oasys objects.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2001,
    2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support, <sac@cygnus.com>.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ skipping 888 matching lines @@
 
 static bfd_boolean
 oasys_write_header (bfd *abfd)
 {
   /* Create and write the header.  */
   oasys_header_record_type r;
   size_t length = strlen (abfd->filename);
 
   if (length > (size_t) sizeof (r.module_name))
     length = sizeof (r.module_name);
+  else if (length < (size_t) sizeof (r.module_name))
+    (void) memset (r.module_name + length, ' ',
+                   sizeof (r.module_name) - length);
 
   (void) memcpy (r.module_name, abfd->filename, length);
-  (void) memset (r.module_name + length, ' ', sizeof (r.module_name) - length);
 
   r.version_number = OASYS_VERSION_NUMBER;
   r.rev_number = OASYS_REV_NUMBER;
 
   return oasys_write_record (abfd, oasys_record_is_header_enum,
                              (oasys_record_union_type *) & r,
                              offsetof (oasys_header_record_type,
                                        description[0]));
 }
 
@@ skipping 336 matching lines @@
   BFD_JUMP_TABLE_SYMBOLS (oasys),
   BFD_JUMP_TABLE_RELOCS (oasys),
   BFD_JUMP_TABLE_WRITE (oasys),
   BFD_JUMP_TABLE_LINK (oasys),
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   NULL,
 
   NULL
 };