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 e838ac853e06c9e2ae98288417adc35a9ce7d34b..52c3ba05b4848d4f606671f8f3bc2901344e56e2 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 34a729ec0eccd817700ad1b31b71a91a9acc4e89..618e20a2519e17ccdbd2ebd330e08949455671d4 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -2453,6 +2453,12 @@ fragment <<EOF
 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, _("\

diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index f6e011743aa8411f0816572e4be552f51a1cf1bf..701cd3b40ddf506db454c219f4682c0494abac32 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.