--- a/binutils/ld/ldmain.c

+++ b/binutils/ld/ldmain.c

@@ -268,10 +268,12 @@ main (int argc, char **argv)

      interface by default.  */

   demangling = getenv ("COLLECT_NO_DEMANGLE") == NULL;

+  link_info.optimize = TRUE;

   link_info.allow_undefined_version = TRUE;

   link_info.keep_memory = TRUE;

   link_info.combreloc = TRUE;

   link_info.strip_discarded = TRUE;

+  link_info.warn_shared_textrel = TRUE;

   link_info.emit_hash = TRUE;

   link_info.callbacks = &link_callbacks;

   link_info.input_bfds_tail = &link_info.input_bfds;

--- a/binutils/ld/testsuite/ld-elf/eh6.d

+++ b/binutils/ld/testsuite/ld-elf/eh6.d

@@ -1,5 +1,5 @@

 #source: eh6.s

-#ld: --gc-sections -shared

+#ld: --gc-sections -shared --no-warn-shared-textrel

 #readelf: -wf

 #target: x86_64-*-linux-gnu i?86-*-linux-gnu

--- a/binutils/ld/testsuite/ld-elf/hash.d

+++ b/binutils/ld/testsuite/ld-elf/hash.d

@@ -1,6 +1,6 @@

 #source: start.s

 #readelf: -d -s -D

-#ld: -shared --hash-style=gnu

+#ld: -O0 -shared --hash-style=gnu

 #target: *-*-linux*

 #notarget: mips*-*-*

--- a/binutils/ld/testsuite/ld-elfvers/vers.exp

+++ b/binutils/ld/testsuite/ld-elfvers/vers.exp

@@ -570,7 +570,7 @@ proc build_executable { test source libname other mapfile verexp versymexp symex

 proc build_vers_lib_no_pic { test source libname other mapfile verexp versymexp symexp } {

   global shared

-  build_binary $shared "" $test $source $libname $other $mapfile $verexp $versymexp $symexp ""

+  build_binary $shared "" $test $source $libname $other $mapfile $verexp $versymexp $symexp "--no-warn-shared-textrel"

 }

 proc build_vers_lib_pic { test source libname other mapfile verexp versymexp symexp } {

--- a/binutils/ld/testsuite/ld-i386/hidden2.d

+++ b/binutils/ld/testsuite/ld-i386/hidden2.d

@@ -1,5 +1,5 @@

 #as: --32

-#ld: -shared -melf_i386

+#ld: -O0 -shared -melf_i386

 #objdump: -drw

 .*: +file format .*

--- a/binutils/ld/testsuite/ld-i386/i386.exp

+++ b/binutils/ld/testsuite/ld-i386/i386.exp

@@ -73,7 +73,7 @@ set i386tests {

      {{readelf -Ssrl tlspic.rd} {objdump -drj.text tlspic.dd}

       {objdump -sj.got tlspic.sd} {objdump -sj.tdata tlspic.td}}

       "libtlspic.so"}

-    {"TLS descriptor -fpic -shared transitions" "-shared -melf_i386"

+    {"TLS descriptor -fpic -shared transitions" "-shared -melf_i386 -O0"

      "--32" {tlsdesc.s tlspic2.s}

      {{readelf -Ssrl tlsdesc.rd} {objdump -drj.text tlsdesc.dd}

       {objdump "-s -j.got -j.got.plt" tlsdesc.sd} {objdump -sj.tdata tlsdesc.td}}

@@ -90,7 +90,7 @@ set i386tests {

      {{readelf -Ssrl tlsbindesc.rd} {objdump -drj.text tlsbindesc.dd}

       {objdump -sj.got tlsbindesc.sd} {objdump -sj.tdata tlsbindesc.td}}

       "tlsbindesc"}

-    {"TLS -fno-pic -shared" "-shared -melf_i386"

+    {"TLS -fno-pic -shared" "-shared -melf_i386 --no-warn-shared-textrel"

      "--32" {tlsnopic1.s tlsnopic2.s}

      {{readelf -Ssrl tlsnopic.rd} {objdump -drj.text tlsnopic.dd}

       {objdump -sj.got tlsnopic.sd}} "libtlsnopic.so"}

@@ -103,7 +103,7 @@ set i386tests {

      {{objdump -sj.debug_foobar tlsg.sd}} "tlsg"}

     {"TLS @indntpoff with %eax" "-melf_i386" "--32" {tlsindntpoff.s}

      {{objdump -drj.text tlsindntpoff.dd}} "tlsindntpoff"}

-    {"Reloc section order" "-shared -melf_i386 -z nocombreloc" "--32"

+    {"Reloc section order" "-shared -melf_i386 -z nocombreloc --no-warn-shared-textrel" "--32"

      {reloc.s} {{objdump -hw reloc.d}} "reloc.so"}

     {"Basic --emit-relocs support" "-shared -melf_i386 --emit-relocs" "--32"

      {emit-relocs.s} {{readelf --relocs emit-relocs.d}} "emit-relocs.so"}

--- a/binutils/ld/testsuite/ld-x86-64/hidden2.d

+++ b/binutils/ld/testsuite/ld-x86-64/hidden2.d

@@ -1,5 +1,5 @@

 #as: --64

-#ld: -shared -melf_x86_64

+#ld: -O0 -shared -melf_x86_64

 #objdump: -drw

 .*: +file format .*

--- a/binutils/ld/testsuite/ld-x86-64/x86-64.exp

+++ b/binutils/ld/testsuite/ld-x86-64/x86-64.exp

@@ -42,7 +42,7 @@ set x86_64tests {

      {{readelf -WSsrl tlspic.rd} {objdump -drj.text tlspic.dd}

       {objdump -sj.got tlspic.sd} {objdump -sj.tdata tlspic.td}}

       "libtlspic.so"}

-    {"TLS descriptor -fpic -shared transitions" "-shared -melf_x86_64"

+    {"TLS descriptor -fpic -shared transitions" "-shared -melf_x86_64 -O0"

      "--64" {tlsdesc.s tlspic2.s}

      {{readelf -WSsrld tlsdesc.rd} {objdump -drj.text tlsdesc.dd}

       {objdump "-s -j.got -j.got.plt" tlsdesc.sd} {objdump -sj.tdata tlsdesc.td}

@@ -60,7 +60,7 @@ set x86_64tests {

       {objdump -sj.got tlsbindesc.sd} {objdump -sj.tdata tlsbindesc.td}}

       "tlsbindesc"}

     {"TLS with global dynamic and descriptors"

-	"-shared -melf_x86_64" "--64" {tlsgdesc.s}

+	"-shared -melf_x86_64 -O0" "--64" {tlsgdesc.s}

      {{readelf -WSsrl tlsgdesc.rd} {objdump -drj.text tlsgdesc.dd}}

       "libtlsgdesc.so"}

     {"TLS in debug sections" "-melf_x86_64"