Check DEFAULT_LD_Z_RELRO for -z relro help message

	* lexsup.c (elf_shlib_list_options): Check DEFAULT_LD_Z_RELRO
	for -z relro help message.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index da0c79c86a42dfcdbf1d0397179c6372551d7af7..e829529cb7b2db1057d6722e8b04b3394fddda3e 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2016-06-24  Dilyan Palauzov <dilyan.palauzov@aegee.org>
+           H.J. Lu  <hongjiu.lu@intel.com>
+
+       * lexsup.c (elf_shlib_list_options): Check DEFAULT_LD_Z_RELRO
+       for -z relro help message.
+
 2016-06-22  Maciej W. Rozycki  <macro@imgtec.com>
 
        * testsuite/ld-mips-elf/undefweak-overflow.d: Use wildcard

diff --git a/ld/lexsup.c b/ld/lexsup.c
index 6e0f9329982ae784ae4034376e16a6d93eb1389a..7f8146ca357d1174d02906dd9badea0e37d2d363 100644 (file)
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -1754,10 +1754,17 @@ elf_shlib_list_options (FILE *file)
   fprintf (file, _("\
   -z origin                   Mark object requiring immediate $ORIGIN\n\
                                processing at runtime\n"));
+#if DEFAULT_LD_Z_RELRO
   fprintf (file, _("\
-  -z relro                    Create RELRO program header\n"));
+  -z relro                    Create RELRO program header (default)\n"));
   fprintf (file, _("\
   -z norelro                  Don't create RELRO program header\n"));
+#else
+  fprintf (file, _("\
+  -z relro                    Create RELRO program header\n"));
+  fprintf (file, _("\
+  -z norelro                  Don't create RELRO program header (default)\n"));
+#endif
   fprintf (file, _("\
   -z common                   Generate common symbols with STT_COMMON type\n"));
   fprintf (file, _("\