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.
This commit is contained in:
H.J. Lu 2016-06-24 05:21:43 -07:00
parent 8b302db80c
commit da4463c7d7
2 changed files with 14 additions and 1 deletions

View File

@ -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> 2016-06-22 Maciej W. Rozycki <macro@imgtec.com>
* testsuite/ld-mips-elf/undefweak-overflow.d: Use wildcard * testsuite/ld-mips-elf/undefweak-overflow.d: Use wildcard

View File

@ -1754,10 +1754,17 @@ elf_shlib_list_options (FILE *file)
fprintf (file, _("\ fprintf (file, _("\
-z origin Mark object requiring immediate $ORIGIN\n\ -z origin Mark object requiring immediate $ORIGIN\n\
processing at runtime\n")); processing at runtime\n"));
#if DEFAULT_LD_Z_RELRO
fprintf (file, _("\
-z relro Create RELRO program header (default)\n"));
fprintf (file, _("\
-z norelro Don't create RELRO program header\n"));
#else
fprintf (file, _("\ fprintf (file, _("\
-z relro Create RELRO program header\n")); -z relro Create RELRO program header\n"));
fprintf (file, _("\ fprintf (file, _("\
-z norelro Don't create RELRO program header\n")); -z norelro Don't create RELRO program header (default)\n"));
#endif
fprintf (file, _("\ fprintf (file, _("\
-z common Generate common symbols with STT_COMMON type\n")); -z common Generate common symbols with STT_COMMON type\n"));
fprintf (file, _("\ fprintf (file, _("\