From 4af68b9c78aad1b82bfd6e2e960747eb160bb4d8 Mon Sep 17 00:00:00 2001 From: Jiong Wang Date: Wed, 9 Sep 2015 14:25:33 +0100 Subject: [PATCH] [AArch64] Sort IS_AARCH64_TLS_RELAX_RELOC in alphabetic order This can also speedup the check as TLSDESC is the default model for global/local dynamic that the big "||" check can finish more quickly than putting them at the bottom. 2015-09-09 Jiong. Wang bfd/ * elfnn-aarch64.c (IS_AARCH64_TLS_RELAX_RELOC): Sort alphabetically. --- bfd/ChangeLog | 4 ++++ bfd/elfnn-aarch64.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1a07fbabb9e..c50979b3f50 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2015-09-09 Jiong Wang + + * elfnn-aarch64.c (IS_AARCH64_TLS_RELAX_RELOC): Sort alphabetically. + 2015-09-09 Jiong Wang * elfnn-aarch64.c (aarch64_tls_transition_without_check): Support three diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 696fdcc1325..c9780fcf11f 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -207,7 +207,13 @@ || IS_AARCH64_TLSDESC_RELOC ((R_TYPE))) #define IS_AARCH64_TLS_RELAX_RELOC(R_TYPE) \ - ((R_TYPE) == BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21 \ + ((R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC \ + || (R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21 \ + || (R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_ADR_PREL21 \ + || (R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_CALL \ + || (R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_LD_PREL19 \ + || (R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_LDNN_LO12_NC \ + || (R_TYPE) == BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSGD_ADR_PREL21 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 \ @@ -215,13 +221,7 @@ || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_LDNN_GOTTPREL_LO12_NC \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21 \ - || (R_TYPE) == BFD_RELOC_AARCH64_TLSLD_ADR_PREL21 \ - || (R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21 \ - || (R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_ADR_PREL21 \ - || (R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_LD_PREL19 \ - || (R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_LDNN_LO12_NC \ - || (R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_CALL \ - || (R_TYPE) == BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC) + || (R_TYPE) == BFD_RELOC_AARCH64_TLSLD_ADR_PREL21) #define IS_AARCH64_TLSDESC_RELOC(R_TYPE) \ ((R_TYPE) == BFD_RELOC_AARCH64_TLSDESC \ -- 2.30.2