Document -z text, -z notext and -z textoff

	* ld.texinfo: Document -z text, -z notext and -z textoff.
	* emultempl/elf32.em (gld${EMULATION_NAME}_list_options): Add
	-z text, -z notext and -z textoff.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e838ac8..52c3ba0 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,11 @@
 2015-02-06  H.J. Lu  <hongjiu.lu@intel.com>
 
+       * ld.texinfo: Document -z text, -z notext and -z textoff.
+       * emultempl/elf32.em (gld${EMULATION_NAME}_list_options): Add
+       -z text, -z notext and -z textoff.
+
+2015-02-06  H.J. Lu  <hongjiu.lu@intel.com>
+
        * configure.ac: Add AC_FUNC_MMAP.
        * config.in: Regenerated.
        * configure: Likewise.

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 34a729e..618e20a 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -2454,6 +2454,12 @@ EOF
 if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
 fragment <<EOF
   fprintf (file, _("\
+  -z text                     Treat DT_TEXTREL in shared object as error\n"));
+  fprintf (file, _("\
+  -z notext                   Don't treat DT_TEXTREL in shared object as error\n"));
+  fprintf (file, _("\
+  -z textoff                  Don't treat DT_TEXTREL in shared object as error\n"));
+  fprintf (file, _("\
   -z norelro                  Don't create RELRO program header\n"));
   fprintf (file, _("\
   -z now                      Mark object non-lazy runtime binding\n"));

diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index f6e0117..701cd3b 100644 (file)
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -1106,6 +1106,15 @@ Marks the object can not be dumped by @code{dldump}.
 @item noexecstack
 Marks the object as not requiring executable stack.
 
+@item text
+Treat DT_TEXTREL in shared object as error.
+
+@item notext
+Don't treat DT_TEXTREL in shared object as error.
+
+@item textoff
+Don't treat DT_TEXTREL in shared object as error.
+
 @item norelro
 Don't create an ELF @code{PT_GNU_RELRO} segment header in the object.