From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by sourceware.org (Postfix) with ESMTPS id 49A213858C36 for ; Tue, 20 Feb 2024 17:56:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 49A213858C36 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 49A213858C36 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::52c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708451800; cv=none; b=X3YuKbak/QDkdfRp9W/2Sj23r9fgCHDThW0di0TK9l/Ge9egKEheCziSzwEiIjUfoF76uZm6kQsqlXzEo0kxiptcwqsrZrPlzsyHIy2RqJZFLClg5LVYgzrwLlZVl9Tg4z2SiIzPkuJEcPzZFUAne0WSStwHowtP9MDeXJm8v98= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708451800; c=relaxed/simple; bh=5lpM9+5EUkJbSyvLZXvpURKYqmO+gjMAPoiecjewCyM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=cahGXHkyDHUHU0EgKF+QYNQzX/nev0gAZER8VK2b6QEc9oO2eQjiONWwJg+W86dP3MJNPGcOTQdAS01Ka5AtxjuMe9MnTWELT+WK1Nr9aWTtW81omKPhL9qSPqjUHA1CyvdXKZ0kio9/mnGdO7vfICGSdxIIErrBQlr1SPD4w20= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x52c.google.com with SMTP id 41be03b00d2f7-5cdbc42f5efso1496440a12.0 for ; Tue, 20 Feb 2024 09:56:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708451796; x=1709056596; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cw/79Jt/roBBag0K16B2pqrdwn5Hy1kgaa6MBKODbv4=; b=BS24hpSq0AZwHTqkcDbF7j9DKkdG/8ooYHhRaoUf+fcLR8/YCKrT2Wn03rH/WohhJK 69o89NHBnzYLCy0Zv04CAxqeGSQdzMRvRoLnzsuTjBGG4ksVAw8QpnY3rfX68Z84sku/ JzxCBTXLluNW4Js4ZvoFoiE+31UAYo1VFhOkRBTnpJ2JVvjhl4GHZsoRRwzx/TmNYpL9 00ibU/MK/OU+xqDaNAyzXCCxgr0dG2FzwHOTj8ZurwoLTktVwKFCX7dZdgeuQU8Ht8gD P68B7/KLO81m7DTfDZlc7e/oi9iE+Ruu1mcIZ5hGZgX2DVJxL1BrGlX4ZPkW1f+qNP2b lXzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708451796; x=1709056596; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cw/79Jt/roBBag0K16B2pqrdwn5Hy1kgaa6MBKODbv4=; b=OFuxgQoeqtmbS2xNmf9X56FQhDGs5hRewp8ioorMZTS1CN+6+Z/lhamGP36eQDyxDI 5/GF1eCQE+BbfOyM7vF0qT4haq3yjpxj97NO29necBKZNFIUBm7XMoD9cVmnVBnK1Ep3 x5YaWvKZWQsri2nEVIfaaDcARSCGSUnPq9ahtYShwkL9m3rsx2i1M+ySawx1FOmDksyh Ksiu3Sge1+O7TV5fzZlBnmKkaEG/M3rAuB2NTAlobFOs9UQZy3ojgImz2vrGqIckc6WP I/+ber5d9PGeqt0p8EZuzLWfaa/3SgvBniOOX6QFCCE7RziGifuJTPysqjsNrQdcan9g X2SQ== X-Gm-Message-State: AOJu0YzYnm9ZcXiYAxyOr1+ZbyMedc6Q1BM8sL0IwJRSGqoF8YqFW7Ww BKzocoKGwi/qlj73W8jdc5DQnbcckQ9BdaBVI7fYIGZ0kC+97DlBxgQUthxrjEGZaA== X-Google-Smtp-Source: AGHT+IEqkRcVRp4d1g6jqBHd0KPDYiNzsfCbIIX0K42vpEIV9CqwHsRjjDMRwhLw4v/NiYU4DVDrXQ== X-Received: by 2002:a17:902:ea0f:b0:1db:eb9e:170b with SMTP id s15-20020a170902ea0f00b001dbeb9e170bmr7133662plg.0.1708451796274; Tue, 20 Feb 2024 09:56:36 -0800 (PST) Received: from localhost (zz20184013906F627101.userreverse.dion.ne.jp. [111.98.113.1]) by smtp.gmail.com with ESMTPSA id o6-20020a170902d4c600b001dbcf63e406sm5848903plg.47.2024.02.20.09.56.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 09:56:35 -0800 (PST) From: Tatsuyuki Ishi To: binutils@sourceware.org Cc: i@maskray.me, nelson@rivosinc.com, rui314@gmail.com, ruiu@bluewhale.systems, Tatsuyuki Ishi Subject: [PATCH v4 6/9] RISC-V: Move STATIC_TLS handling into record_tls_type. Date: Wed, 21 Feb 2024 02:55:53 +0900 Message-ID: <20240220175556.304692-7-ishitatsuyuki@gmail.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220175556.304692-1-ishitatsuyuki@gmail.com> References: <20230817180852.121628-2-ishitatsuyuki@gmail.com> <20240220175556.304692-1-ishitatsuyuki@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: bfd/Changelog: * elfnn-riscv.c (riscv_elf_record_tls_type): Add bfd_link_info parameter and move code from below. (riscv_elf_check_relocs): Move STATIC_TLS handling into riscv_elf_record_tls_type. Add missing early return in the R_RISCV_TPREL_HI20 case. --- bfd/elfnn-riscv.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index 16394110c6a..1594856ccef 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -663,12 +663,14 @@ riscv_elf_copy_indirect_symbol (struct bfd_link_info *info, } static bool -riscv_elf_record_tls_type (bfd *abfd, struct elf_link_hash_entry *h, +riscv_elf_record_tls_type (bfd *abfd, struct bfd_link_info *info, + struct elf_link_hash_entry *h, unsigned long symndx, char tls_type) { char *new_tls_type = &_bfd_riscv_elf_tls_type (abfd, h, symndx); *new_tls_type |= tls_type; + if ((*new_tls_type & GOT_NORMAL) && (*new_tls_type & ~GOT_NORMAL)) { (*_bfd_error_handler) @@ -676,6 +678,10 @@ riscv_elf_record_tls_type (bfd *abfd, struct elf_link_hash_entry *h, abfd, h ? h->root.root.string : ""); return false; } + + if ((*new_tls_type & GOT_TLS_IE) && bfd_link_dll (info)) + info->flags |= DF_STATIC_TLS; + return true; } @@ -839,27 +845,29 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, { case R_RISCV_TLS_GD_HI20: if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx) - || !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_GD)) + || !riscv_elf_record_tls_type (abfd, info, h, r_symndx, + GOT_TLS_GD)) return false; break; case R_RISCV_TLS_GOT_HI20: - if (bfd_link_dll (info)) - info->flags |= DF_STATIC_TLS; if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx) - || !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_IE)) + || !riscv_elf_record_tls_type (abfd, info, h, r_symndx, + GOT_TLS_IE)) return false; break; case R_RISCV_GOT_HI20: if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx) - || !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_NORMAL)) + || !riscv_elf_record_tls_type (abfd, info, h, r_symndx, + GOT_NORMAL)) return false; break; case R_RISCV_TLSDESC_HI20: if (!riscv_elf_record_got_reference (abfd, info, h, r_symndx) - || !riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLSDESC)) + || !riscv_elf_record_tls_type (abfd, info, h, r_symndx, + GOT_TLSDESC)) return false; break; @@ -949,8 +957,9 @@ riscv_elf_check_relocs (bfd *abfd, struct bfd_link_info *info, /* This is not allowed in the pic, but okay in pie. */ if (!bfd_link_executable (info)) return bad_static_reloc (abfd, r_type, h); - if (h != NULL) - riscv_elf_record_tls_type (abfd, h, r_symndx, GOT_TLS_LE); + if (h != NULL + && !riscv_elf_record_tls_type (abfd, info, h, r_symndx, GOT_TLS_LE)) + return false; break; case R_RISCV_HI20: -- 2.43.2