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