diff options
| author | Sudakshina Das <sudi.das@arm.com> | 2019-06-06 12:21:14 +0100 |
|---|---|---|
| committer | Sudakshina Das <sudi.das@arm.com> | 2019-06-06 12:21:14 +0100 |
| commit | 8bf6d176b0a442a8091d338d4af971591d19922c (patch) | |
| tree | aa7c82ae70d416ec87d5bd5e70efbf82d657c86a /bfd | |
| parent | 811731b21b0a5b5459b33bfcbe26f40c6d9bc7c0 (diff) | |
| download | gdb-8bf6d176b0a442a8091d338d4af971591d19922c.zip gdb-8bf6d176b0a442a8091d338d4af971591d19922c.tar.gz gdb-8bf6d176b0a442a8091d338d4af971591d19922c.tar.bz2 | |
[LD, AArch64] Move ELF options behind -z
This patch moves the current AArch64 ld options of --force-bti
and --pac-plt to -z force-bti and -z pac-plt since these are
ELF specific options.
*** bfd/ChangeLog ***
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.
*** ld/ChangeLog ***
2019-06-06 Sudakshina Das <sudi.das@arm.com>
* NEWS: Update options names.
* emultempl/aarch64elf.em (OPTION_FORCE_BTI, OPTION_PAC_PLT): Remove.
(PARSE_AND_LIST_LONGOPTS): Remove force-bti and pac-plt.
(PARSE_AND_LIST_OPTIONS): Update to -z.
(PARSE_AND_LIST_ARGS_CASE_Z_AARCH64): New.
(PARSE_AND_LIST_ARGS_CASE_Z): Add PARSE_AND_LIST_ARGS_CASE_Z_AARCH64.
(PARSE_AND_LIST_ARGS_CASES): Move cases for these options.
* testsuite/ld-aarch64/bti-pac-plt-1.d: Update option.
* testsuite/ld-aarch64/bti-pac-plt-2.d: Likewise.
* testsuite/ld-aarch64/bti-plt-1.d: Likewise.
* testsuite/ld-aarch64/bti-plt-2.d: Likewise.
* testsuite/ld-aarch64/bti-plt-3.d: Likewise.
* testsuite/ld-aarch64/bti-plt-4.d: Likewise.
* testsuite/ld-aarch64/bti-plt-6.d: Likewise.
* testsuite/ld-aarch64/bti-plt-7.d: Likewise.
* testsuite/ld-aarch64/bti-warn.d: Likewise.
* testsuite/ld-aarch64/pac-plt-1.d: Likewise.
* testsuite/ld-aarch64/pac-plt-2.d: Likewise.
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; |