diff options
| -rw-r--r-- | bfd/elf32-ppc.c | 17 | ||||
| -rw-r--r-- | include/bfdlink.h | 3 | ||||
| -rw-r--r-- | ld/lexsup.c | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/elf.exp | 8 |
4 files changed, 25 insertions, 5 deletions
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index a8234f2..833bc74 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -4020,12 +4020,19 @@ ppc_elf_select_plt_layout (bfd *output_bfd ATTRIBUTE_UNUSED, htab->plt_type = plt_type; } } - if (htab->plt_type == PLT_OLD && htab->params->plt_style == PLT_NEW) + if (htab->plt_type == PLT_OLD) { - if (htab->old_bfd != NULL) - _bfd_error_handler (_("bss-plt forced due to %pB"), htab->old_bfd); - else - _bfd_error_handler (_("bss-plt forced by profiling")); + if (!info->user_warn_rwx_segments) + info->no_warn_rwx_segments = 1; + if (htab->params->plt_style == PLT_NEW + || (htab->params->plt_style != PLT_OLD + && !info->no_warn_rwx_segments)) + { + if (htab->old_bfd != NULL) + _bfd_error_handler (_("bss-plt forced due to %pB"), htab->old_bfd); + else + _bfd_error_handler (_("bss-plt forced by profiling")); + } } BFD_ASSERT (htab->plt_type != PLT_VXWORKS); diff --git a/include/bfdlink.h b/include/bfdlink.h index 26c459c..840790a 100644 --- a/include/bfdlink.h +++ b/include/bfdlink.h @@ -501,6 +501,9 @@ struct bfd_link_info /* TRUE if warnings should not be generated for TLS segments with eXecute permission or LOAD segments with RWX permissions. */ unsigned int no_warn_rwx_segments: 1; + /* TRUE if the user gave either --warn-rwx-segments or + --no-warn-rwx-segments. */ + unsigned int user_warn_rwx_segments: 1; /* TRUE if the stack can be made executable because of the absence of a .note.GNU-stack section in an input file. Note - even if this field diff --git a/ld/lexsup.c b/ld/lexsup.c index c596038..a1c6140 100644 --- a/ld/lexsup.c +++ b/ld/lexsup.c @@ -936,9 +936,11 @@ parse_args (unsigned argc, char **argv) break; case OPTION_WARN_RWX_SEGMENTS: link_info.no_warn_rwx_segments = 0; + link_info.user_warn_rwx_segments = 1; break; case OPTION_NO_WARN_RWX_SEGMENTS: link_info.no_warn_rwx_segments = 1; + link_info.user_warn_rwx_segments = 1; break; case 'e': lang_add_entry (optarg, true); diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp index 1a160d0..a4f7f60 100644 --- a/ld/testsuite/ld-elf/elf.exp +++ b/ld/testsuite/ld-elf/elf.exp @@ -238,6 +238,12 @@ if { [istarget *-*-*linux*] return $text } + set curr_ldflags $LDFLAGS + if { [istarget powerpc*-*-*] && ![istarget powerpc64*-*-*] } { + # Don't generate an executable .plt section + set LDFLAGS "$LDFLAGS --secure-plt" + } + # Since the warnings can be disabled by configure, ensure consistency # of the first test by forcing the flags. run_ld_link_tests [list \ @@ -285,6 +291,8 @@ if { [istarget *-*-*linux*] "rwx-segments-3.exe"] \ ] + set LDFLAGS $curr_ldflags + if { [target_defaults_to_execstack] } { run_ld_link_tests [list \ [list "PR ld/29072 (warn about absent .note.GNU-stack)" \ |