Merge branch 'vendor/BINUTILS221'
authorJohn Marino <draco@marino.st>
Sat, 16 Jul 2011 12:08:11 +0000 (14:08 +0200)
committerJohn Marino <draco@marino.st>
Sat, 16 Jul 2011 12:08:11 +0000 (14:08 +0200)
Conflicts:
contrib/binutils-2.21/bfd/doc/bfdver.texi
contrib/binutils-2.21/binutils/doc/addr2line.1
contrib/binutils-2.21/binutils/doc/ar.1
contrib/binutils-2.21/binutils/doc/elfedit.1
contrib/binutils-2.21/binutils/doc/nm.1
contrib/binutils-2.21/binutils/doc/objcopy.1
contrib/binutils-2.21/binutils/doc/objdump.1
contrib/binutils-2.21/binutils/doc/ranlib.1
contrib/binutils-2.21/binutils/doc/readelf.1
contrib/binutils-2.21/binutils/doc/size.1
contrib/binutils-2.21/binutils/doc/strings.1
contrib/binutils-2.21/binutils/doc/strip.1
contrib/binutils-2.21/gas/doc/as.1
contrib/binutils-2.21/ld/ld.1

1  2 
contrib/binutils-2.21/gold/options.h
contrib/binutils-2.21/ld/ldlex.l

@@@ -623,6 -623,10 +623,10 @@@ class General_option
    DEFINE_bool_alias(Bstatic, Bdynamic, options::ONE_DASH, '\0',
                    N_("-l does not search for shared libraries"), NULL,
                    true);
+   DEFINE_bool_alias(dy, Bdynamic, options::ONE_DASH, '\0',
+                   N_("alias for -Bdynamic"), NULL, false);
+   DEFINE_bool_alias(dn, Bdynamic, options::ONE_DASH, '\0',
+                   N_("alias for -Bstatic"), NULL, true);
  
    DEFINE_bool(Bsymbolic, options::ONE_DASH, '\0', false,
                N_("Bind defined symbols locally"), NULL);
    DEFINE_string(soname, options::ONE_DASH, 'h', NULL,
                  N_("Set shared library name"), N_("FILENAME"));
  
 -  DEFINE_bool(i, options::EXACTLY_ONE_DASH, '\0', false,
 -            N_("Ignored"), NULL);
 -
    DEFINE_double(hash_bucket_empty_fraction, options::TWO_DASHES, '\0', 0.0,
                N_("Min fraction of empty buckets in dynamic hash"),
                N_("FRACTION"));
  
    DEFINE_bool(relocatable, options::EXACTLY_ONE_DASH, 'r', false,
                N_("Generate relocatable output"), NULL);
 +  DEFINE_bool_alias(i, relocatable, options::EXACTLY_ONE_DASH, '\0',
 +                  N_("Synonym for -r"), NULL, false);
  
    DEFINE_bool(relax, options::TWO_DASHES, '\0', false,
              N_("Relax branches on certain targets"), NULL);
@@@ -24,7 -24,6 +24,7 @@@
     Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
     MA 02110-1301, USA.  */
  
 +#include "sysdep.h"
  #include "bfd.h"
  #include "safe-ctype.h"
  #include "bfdlink.h"
@@@ -689,7 -688,7 +689,7 @@@ lex_warn_invalid (char *where, char *wh
  
    if (! ISPRINT (*what))
      {
-       sprintf (buf, "\\%03o", (unsigned int) *what);
+       sprintf (buf, "\\%03o", *(unsigned char *) what);
        what = buf;
      }