eafd389
diff -rup ../binutils-2.19.51.0.10.orig/ld/ldmain.c ./ld/ldmain.c
eafd389
--- ../binutils-2.19.51.0.10.orig/ld/ldmain.c	2009-06-22 15:56:54.000000000 +0100
eafd389
+++ ./ld/ldmain.c	2009-06-22 16:05:54.000000000 +0100
eafd389
@@ -256,14 +256,6 @@ main (int argc, char **argv)
eafd389
   command_line.warn_search_mismatch = TRUE;
eafd389
   command_line.check_section_addresses = -1;
fe03d62
 
eafd389
-  if (getenv ("LD_SYMBOLIC") != NULL)
eafd389
-    command_line.symbolic = symbolic;
eafd389
-  else if (getenv ("LD_SYMBOLIC_FUNCTIONS") != NULL)
eafd389
-    command_line.symbolic = symbolic_functions;
dc18033
-
eafd389
-  if (getenv ("LD_AS_NEEDED") != NULL)
eafd389
-    as_needed = TRUE;
eafd389
-
eafd389
   /* We initialize DEMANGLING based on the environment variable
eafd389
      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
eafd389
      output of the linker, unless COLLECT_NO_DEMANGLE is set in the
eafd389
diff -rup ../binutils-2.19.51.0.10.orig/ld/ld.texinfo ./ld/ld.texinfo
eafd389
--- ../binutils-2.19.51.0.10.orig/ld/ld.texinfo	2009-06-22 15:56:53.000000000 +0100
eafd389
+++ ./ld/ld.texinfo	2009-06-22 16:05:42.000000000 +0100
eafd389
@@ -1118,10 +1118,7 @@ for a library that satisfies a symbol re
eafd389
 which is undefined at the point that the library was linked, or, if
eafd389
 the library is not found in the DT_NEEDED lists of other libraries
eafd389
 linked up to that point, a reference from another dynamic library.
eafd389
-@option{--no-as-needed} restores the default behaviour.  If the
eafd389
-environment variable @code{LD_AS_NEEDED} is set, the linker will
eafd389
-behave as if the @option{--as-needed} option is passed to the linker as
eafd389
-the first command line option.
eafd389
+@option{--no-as-needed} restores the default behaviour.
44cfb8c
 
eafd389
 @kindex --add-needed
eafd389
 @kindex --no-add-needed
eafd389
@@ -1185,21 +1182,14 @@ When creating a shared library, bind ref
dc18033
 definition within the shared library, if any.  Normally, it is possible
dc18033
 for a program linked against a shared library to override the definition
dc18033
 within the shared library.  This option is only meaningful on ELF
dc18033
-platforms which support shared libraries.  If @option{-Bsymbolic} is not
dc18033
-used when linking a shared library, the linker will also turn on this
dc18033
-option if the environment variable @code{LD_SYMBOLIC} is set.
dc18033
+platforms which support shared libraries.
dc18033
 
dc18033
 @kindex -Bsymbolic-functions
dc18033
 @item -Bsymbolic-functions
dc18033
 When creating a shared library, bind references to global function
900278a
 symbols to the definition within the shared library, if any.
dc18033
 This option is only meaningful on ELF platforms which support shared
dc18033
-libraries.  If @option{-Bsymbolic-functions} is not used when linking a
dc18033
-shared library, the linker will also turn on this option if the
dc18033
-environment variable @code{LD_SYMBOLIC_FUNCTIONS} is set.  When
dc18033
-both environment variables @code{LD_SYMBOLIC} and
dc18033
-@code{LD_SYMBOLIC_FUNCTIONS} are set, @code{LD_SYMBOLIC} will take
dc18033
-precedent.
dc18033
+libraries.
dc18033
 
dc18033
 @kindex --dynamic-list=@var{dynamic-list-file}
dc18033
 @item --dynamic-list=@var{dynamic-list-file}
eafd389
diff -rup ../binutils-2.19.51.0.10.orig/ld/NEWS ./ld/NEWS
eafd389
--- ../binutils-2.19.51.0.10.orig/ld/NEWS	2009-06-22 15:56:54.000000000 +0100
eafd389
+++ ./ld/NEWS	2009-06-22 16:04:15.000000000 +0100
eafd389
@@ -55,11 +55,6 @@
eafd389
   For the switch --enable-runtime-pseudo-reloc it uses for 32-bit
eafd389
   runtime pseudo relocation version one, for 64-bit the version two.
44cfb8c
 
eafd389
-* ELF: Support environment variable LD_AS_NEEDED for --as-needed.
44cfb8c
-
eafd389
-* ELF: Support environment variables, LD_SYMBOLIC for -Bsymbolic and
eafd389
-  LD_SYMBOLIC_FUNCTIONS for -Bsymbolic-functions.
eafd389
-
eafd389
 Changes in 2.19:
eafd389
 
eafd389
 * Linker scripts support a new INSERT command that makes it easier to