diff --git a/ld/ChangeLog b/ld/ChangeLog index da0c79c86a..e829529cb7 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2016-06-24 Dilyan Palauzov + H.J. Lu + + * lexsup.c (elf_shlib_list_options): Check DEFAULT_LD_Z_RELRO + for -z relro help message. + 2016-06-22 Maciej W. Rozycki * testsuite/ld-mips-elf/undefweak-overflow.d: Use wildcard diff --git a/ld/lexsup.c b/ld/lexsup.c index 6e0f932998..7f8146ca35 100644 --- 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 (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\n")); + -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, _("\