dc18033
--- ld/NEWS.jj	2007-01-28 11:49:31.000000000 -0500
dc18033
+++ ld/NEWS	2007-03-01 04:21:37.000000000 -0500
dc18033
@@ -1,7 +1,4 @@
dc18033
 -*- text -*-
dc18033
-* ELF: Support environment variables, LD_SYMBOLIC for -Bsymbolic and
dc18033
-  LD_SYMBOLIC_FUNCTIONS for -Bsymbolic-functions.
dc18033
-
dc18033
 * Add a new command line option '--default-script=FILE' or '-dT FILE'
dc18033
   which specifies a replacement for the built in, default linker
dc18033
   script.
dc18033
--- ld/ld.texinfo.jj	2007-01-28 11:49:31.000000000 -0500
dc18033
+++ ld/ld.texinfo	2007-03-01 04:25:24.000000000 -0500
dc18033
@@ -1144,21 +1144,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
dc18033
 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}
dc18033
--- ld/ldmain.c.jj	2007-01-28 11:49:31.000000000 -0500
dc18033
+++ ld/ldmain.c	2007-03-01 04:22:40.000000000 -0500
dc18033
@@ -256,12 +256,7 @@ main (int argc, char **argv)
dc18033
   command_line.warn_mismatch = TRUE;
dc18033
   command_line.check_section_addresses = TRUE;
dc18033
   command_line.accept_unknown_input_arch = FALSE;
dc18033
-  if (getenv ("LD_SYMBOLIC") != NULL)
dc18033
-    command_line.symbolic = symbolic;
dc18033
-  else if (getenv ("LD_SYMBOLIC_FUNCTIONS") != NULL)
dc18033
-    command_line.symbolic = symbolic_functions;
dc18033
-  else
dc18033
-    command_line.symbolic = symbolic_unset;
dc18033
+  command_line.symbolic = symbolic_unset;
dc18033
   command_line.dynamic_list = dynamic_list_unset;
dc18033
 
dc18033
   sort_section = none;