diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/bfd-in.h | 2 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 2 | ||||
| -rw-r--r-- | bfd/elfnn-aarch64.c | 4 | ||||
| -rw-r--r-- | bfd/elfxx-aarch64.c | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a6157a4..69624fe 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2019-06-06 Sudakshina Das <sudi.das@arm.com> + + * bfd-in.h: Change comment. + * bfd-in2.h: Regenerate. + * elfnn-aarch64.c (elfNN_aarch64_merge_gnu_properties): Update warning. + * elfxx-aarch64.c (_bfd_aarch64_elf_link_setup_gnu_properties): + Likwise. + 2019-05-28 Faraz Shahbazker <fshahbazker@wavecomp.com> * elfxx-mips.c (mips_elf_calculate_relocation) <R_MIPS_PCHI16>: diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 890a79d..a5e95d1 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -1014,7 +1014,7 @@ typedef enum typedef enum { BTI_NONE = 0, /* BTI is not enabled. */ - BTI_WARN = 1, /* BTI is enabled with --force-bti. */ + BTI_WARN = 1, /* BTI is enabled with -z force-bti. */ } aarch64_enable_bti_type; /* A structure to encompass all information coming from BTI or PAC diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 450c7b7..05e3219 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1021,7 +1021,7 @@ typedef enum typedef enum { BTI_NONE = 0, /* BTI is not enabled. */ - BTI_WARN = 1, /* BTI is enabled with --force-bti. */ + BTI_WARN = 1, /* BTI is enabled with -z force-bti. */ } aarch64_enable_bti_type; /* A structure to encompass all information coming from BTI or PAC diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 761e6b9..282418d 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -10010,14 +10010,14 @@ elfNN_aarch64_merge_gnu_properties (struct bfd_link_info *info, if ((aprop && !(aprop->u.number & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) || !aprop) { - _bfd_error_handler (_("%pB: warning: BTI turned on by --force-bti when " + _bfd_error_handler (_("%pB: warning: BTI turned on by -z force-bti when " "all inputs do not have BTI in NOTE section."), abfd); } if ((bprop && !(bprop->u.number & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) || !bprop) { - _bfd_error_handler (_("%pB: warning: BTI turned on by --force-bti when " + _bfd_error_handler (_("%pB: warning: BTI turned on by -z force-bti when " "all inputs do not have BTI in NOTE section."), bbfd); } diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c index d16f2ec..1249008 100644 --- a/bfd/elfxx-aarch64.c +++ b/bfd/elfxx-aarch64.c @@ -721,7 +721,7 @@ _bfd_aarch64_elf_link_setup_gnu_properties (struct bfd_link_info *info, 4); if (gnu_prop & GNU_PROPERTY_AARCH64_FEATURE_1_BTI && !(prop->u.number & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)) - _bfd_error_handler (_("%pB: warning: BTI turned on by --force-bti " + _bfd_error_handler (_("%pB: warning: BTI turned on by -z force-bti " "when all inputs do not have BTI in NOTE " "section."), ebfd); prop->u.number |= gnu_prop; |