--- ld/NEWS.jj	2007-05-11 11:24:08.000000000 -0400

+++ ld/NEWS	2007-06-12 05:04:49.000000000 -0400

@@ -1,7 +1,4 @@

 -*- text -*-

-* ELF: Support environment variables, LD_SYMBOLIC for -Bsymbolic and

-  LD_SYMBOLIC_FUNCTIONS for -Bsymbolic-functions.

-

 * -l:foo now searches the library path for a filename called foo,

   without converting it to libfoo.a or libfoo.so.

--- ld/ld.texinfo.jj	2007-05-11 11:24:08.000000000 -0400

+++ ld/ld.texinfo	2007-06-12 05:04:33.000000000 -0400

@@ -1147,21 +1147,14 @@ When creating a shared library, bind ref

 definition within the shared library, if any.  Normally, it is possible

 for a program linked against a shared library to override the definition

 within the shared library.  This option is only meaningful on ELF

-platforms which support shared libraries.  If @option{-Bsymbolic} is not

-used when linking a shared library, the linker will also turn on this

-option if the environment variable @code{LD_SYMBOLIC} is set.

+platforms which support shared libraries.

 @kindex -Bsymbolic-functions

 @item -Bsymbolic-functions

 When creating a shared library, bind references to global function

 symbols to the definition within the shared library, if any. 

 This option is only meaningful on ELF platforms which support shared

-libraries.  If @option{-Bsymbolic-functions} is not used when linking a

-shared library, the linker will also turn on this option if the

-environment variable @code{LD_SYMBOLIC_FUNCTIONS} is set.  When

-both environment variables @code{LD_SYMBOLIC} and

-@code{LD_SYMBOLIC_FUNCTIONS} are set, @code{LD_SYMBOLIC} will take

-precedent.

+libraries.

 @kindex --dynamic-list=@var{dynamic-list-file}

 @item --dynamic-list=@var{dynamic-list-file}

--- ld/ldmain.c.jj	2007-05-11 11:24:08.000000000 -0400

+++ ld/ldmain.c	2007-06-12 05:05:48.000000000 -0400

@@ -254,11 +254,6 @@ main (int argc, char **argv)

   command_line.warn_search_mismatch = TRUE;

   command_line.check_section_addresses = TRUE;

-  if (getenv ("LD_SYMBOLIC") != NULL)

-    command_line.symbolic = symbolic;

-  else if (getenv ("LD_SYMBOLIC_FUNCTIONS") != NULL)

-    command_line.symbolic = symbolic_functions;

-

   /* We initialize DEMANGLING based on the environment variable

      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the

      output of the linker, unless COLLECT_NO_DEMANGLE is set in the