From ac21917f6bef764c73323c8117d293b5f6c70228 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Wed, 21 May 2014 16:49:57 +0100 Subject: [PATCH] bfd/elfnn-aarch64.c: Cleanup a couple of TLS functions Add an assert and remove an unused line of code. bfd/ChangeLog: 2014-06-04 Will Newton * elfnn-aarch64.c (tpoff_base): Make test of tls_sec being non-NULL into an assert. (elfNN_aarch64_tls_relax): Remove unused code. --- bfd/ChangeLog | 6 ++++++ bfd/elfnn-aarch64.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 20f1325dec9..e6b88e321f8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2014-06-04 Will Newton + + * elfnn-aarch64.c (tpoff_base): Make test of tls_sec + being non-NULL into an assert. + (elfNN_aarch64_tls_relax): Remove unused code. + 2014-06-03 DJ Delorie * elf32-rx.c (rx_table_map): Use BFD_VMA_FMT for portability. diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 498b7bd1213..d917c7e5139 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -3301,8 +3301,7 @@ tpoff_base (struct bfd_link_info *info) struct elf_link_hash_table *htab = elf_hash_table (info); /* If tls_sec is NULL, we should have signalled an error already. */ - if (htab->tls_sec == NULL) - return 0; + BFD_ASSERT (htab->tls_sec != NULL); bfd_vma base = align_power ((bfd_vma) TCB_SIZE, htab->tls_sec->alignment_power); @@ -3938,7 +3937,6 @@ elfNN_aarch64_tls_relax (struct elf_aarch64_link_hash_table *globals, or adrp x0, :tlsdesc:var => adrp x0, :gottprel:var */ - insn = bfd_getl32 (contents + rel->r_offset); return bfd_reloc_continue; } -- 2.30.2