From b14b7ff14ffe911ec562004304841cf7d2775a19 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 4 Jul 2018 06:22:40 -0700 Subject: [PATCH] ld: Properly display default for -z separate-code Check DEFAULT_LD_Z_SEPARATE_CODE to display default for -z separate-code. PR ld/23358 * lexsup.c (elf_shlib_list_options): Properly display default for -z separate-code. --- ld/ChangeLog | 6 ++++++ ld/lexsup.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ld/ChangeLog b/ld/ChangeLog index a3e8594338d..66960147b2f 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2018-07-04 H.J. Lu + + PR ld/23358 + * lexsup.c (elf_shlib_list_options): Properly display default + for -z separate-code. + 2018-07-02 Maciej W. Rozycki * testsuite/ld-mips-elf/mips-elf.exp: Fix a typo in PR ld/21334 diff --git a/ld/lexsup.c b/ld/lexsup.c index a4bc7da67fa..86a033a383f 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -1796,10 +1796,17 @@ elf_shlib_list_options (FILE *file) fprintf (file, _("\ -z norelro Don't create RELRO program header (default)\n")); #endif +#if DEFAULT_LD_Z_SEPARATE_CODE + fprintf (file, _("\ + -z separate-code Create separate code program header (default)\n")); + fprintf (file, _("\ + -z noseparate-code Don't create separate code program header\n")); +#else fprintf (file, _("\ -z separate-code Create separate code program header\n")); fprintf (file, _("\ -z noseparate-code Don't create separate code program header (default)\n")); +#endif fprintf (file, _("\ -z common Generate common symbols with STT_COMMON type\n")); fprintf (file, _("\ -- 2.30.2