From patchwork Thu Aug 31 17:13:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tatsuyuki Ishi X-Patchwork-Id: 137322 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c792:0:b0:3f2:4152:657d with SMTP id b18csp383444vqu; Thu, 31 Aug 2023 10:14:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFGcyaw8oJ9M3myOlRUfSOCTEJIKB/C8+rJTbSK1+FB3CCTc/d2z8zB+4+eU0Vf3z0Wtm/5 X-Received: by 2002:a17:906:538c:b0:9a1:ca55:d0cb with SMTP id g12-20020a170906538c00b009a1ca55d0cbmr466971ejo.23.1693502084147; Thu, 31 Aug 2023 10:14:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693502084; cv=none; d=google.com; s=arc-20160816; b=PGBvhJ/r0NYvT2pLyKCyg6/U2TV98x3qFzu7Mnm13TkdVj/YtCvjh3nwLkeYYTXQzf nn2Ms86sguuQXAlY7fMz/qX+6bM0bjo9hJnw/9/QN/+6v/ybfXkli2ff+fwvzEDSGb8M 3bqcOK21ZzDFC+Obj82rQk51NqWh4ghHcCyGQ+W1wbtHQeE8jrv+L+NXQAhxXc7B+si4 8aAHrI4OsBQ8aXRderQbu/tELzNo6Cv8ENAZo8LhO6mc9YlT9dMV4bdJSJOjjQ+dztRc axSlzbzy9cDx3kuJ/2fC06nVWQEUFTpCb6lHdbZY8+lOkhk7S9uuiJxmIENcrEq3yUAc b7Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=e6Fdik27kWympO6OppIOOukvQGljX0wsKR4PpdYu3wc=; fh=daQvw8iO4pGm+Xx4NLO3E4+0gdDDq/ixoODeemdNLuQ=; b=A0Ze1DJ9bPlLU9NZXo9fzcOmchRu2ng4Ui6wjpnnUqtP1c42CrDDUuCbSaN8vADm3h E6nQKtrP0LzIEk44dr1zhzcQ9fhbJbjfkxLJdIGPLVFd3rs5J7/LMVDmViDzEkEDvSbp 391tTveakA7D7o4OA3bx+wlmb4IsXH42As4dRQSaOQiSxHHc1A5jZEssjZOuim7mCcpf Xx+CgmxJRrdflzb41J7/ov5MTcX5O52qzYNppv7Cf0aupYga/nFg3NWQPVpICYLprVXb pUptGXJRi/v3QfLzS/c02mS3MnVZWjHxoAIYJM3LAF0IT7Bp5oO/+JGsVVgcp2PF8Ck/ rJiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="l/Mmcm0w"; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id ks8-20020a170906f84800b0099bcf1c07cbsi1217948ejb.883.2023.08.31.10.14.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 10:14:44 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b="l/Mmcm0w"; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C270C3858425 for ; Thu, 31 Aug 2023 17:14:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C270C3858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1693502074; bh=e6Fdik27kWympO6OppIOOukvQGljX0wsKR4PpdYu3wc=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=l/Mmcm0w8ov63nDo1/HaVYudzkAjcAp86WFP66a/Ic79bTKMDNQOgP7jDaWQUGFqO ainwdmCqMsrQxg3GSKsmeWvFTKLlVX+0BJ2y/5FLJHmH3JChy8i4wJsnHQ0376KWvy F1QcZJx5tAU8wWKkWsyfYR486ErQN0T2XyNtgtgc= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id 99BB73858414 for ; Thu, 31 Aug 2023 17:13:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 99BB73858414 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1c0efe0c4acso1222125ad.0 for ; Thu, 31 Aug 2023 10:13:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693502035; x=1694106835; 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=e6Fdik27kWympO6OppIOOukvQGljX0wsKR4PpdYu3wc=; b=XGQz8jsTt20R9aEiRJpMXHTPWaQm8E4rvWscLN09naGQUJ+S7Mn/kEGUUqZJYfnbC4 3sAI466wG0K6o1ncMd68jh7nq0UjgupL2kx48NxIin8MPQbieldXxcGNgdHd/j3XyGKH QqvpUys/IrEGuGqbf+9S0TI2FH7lvawj/8+xPgqiDtyBIUc6RzbA6akKzxyl+f++cjaB Mfu5tD1oN7mwyXBkwHsl0neJbokr4lbY+lierZXvO52yrnXobl1yr7TfUHWGRgfGjxa/ aJac/coZLdZIF3uzgDKK40NTqwDY0X4JAqGgoLk9WHGiJSq9/xp2SqwCo4BwnFV+JJsD AX/Q== X-Gm-Message-State: AOJu0Yzg4djdZ/XyP/7mBhTuvX7XAQtGqL6UINJtkT6cyW1SVx8Cu7dH 0HKnrB8vbQM3nXsVSsrC0BTiuWb4E8d+ypG9 X-Received: by 2002:a17:902:ea03:b0:1c1:fbec:bc3f with SMTP id s3-20020a170902ea0300b001c1fbecbc3fmr354179plg.5.1693502035043; Thu, 31 Aug 2023 10:13:55 -0700 (PDT) Received: from localhost (zz20184013906F627101.userreverse.dion.ne.jp. [111.98.113.1]) by smtp.gmail.com with ESMTPSA id a10-20020a170902ee8a00b001bba3650448sm1483216pld.258.2023.08.31.10.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 10:13:54 -0700 (PDT) To: binutils@sourceware.org Subject: [PATCH v2 2/5] RISC-V: Add TLSDESC reloc definitions. Date: Fri, 1 Sep 2023 02:13:32 +0900 Message-ID: <20230831171345.49052-3-ishitatsuyuki@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230831171345.49052-1-ishitatsuyuki@gmail.com> References: <20230817180852.121628-2-ishitatsuyuki@gmail.com> <20230831171345.49052-1-ishitatsuyuki@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 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 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tatsuyuki Ishi via Binutils From: Tatsuyuki Ishi Reply-To: Tatsuyuki Ishi Cc: Tatsuyuki Ishi , rui314@gmail.com, ruiu@bluewhale.systems Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774500735283371203 X-GMAIL-MSGID: 1775765641399016709 bfd/ * elfxx-riscv.c: Add 5 TLSDESC reloc descriptions. * reloc.c: Likewise. * libbfd.h: Regenerate. * bfd-in2.h: Regenerate. include/ * elf/riscv.h: Add 5 TLSDESC reloc descriptions. --- v2: Properly regenerate the headers instead of updating them by hand. bfd/bfd-in2.h | 4 +++ bfd/elfxx-riscv.c | 75 ++++++++++++++++++++++++++++++++++++++++++++- bfd/libbfd.h | 4 +++ bfd/reloc.c | 8 +++++ include/elf/riscv.h | 5 +++ 5 files changed, 95 insertions(+), 1 deletion(-) diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index e2deb107494..ce324383dee 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -5411,6 +5411,10 @@ number for the SBIC, SBIS, SBI and CBI instructions */ BFD_RELOC_RISCV_TLS_DTPREL64, BFD_RELOC_RISCV_TLS_TPREL32, BFD_RELOC_RISCV_TLS_TPREL64, + BFD_RELOC_RISCV_TLSDESC_HI20, + BFD_RELOC_RISCV_TLSDESC_LOAD_LO12, + BFD_RELOC_RISCV_TLSDESC_ADD_LO12, + BFD_RELOC_RISCV_TLSDESC_CALL, BFD_RELOC_RISCV_ALIGN, BFD_RELOC_RISCV_RVC_BRANCH, BFD_RELOC_RISCV_RVC_JUMP, diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index e9852ef8fa1..43931a2be5d 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -218,8 +218,21 @@ static reloc_howto_type howto_table[] = MINUS_ONE, /* dst_mask */ false), /* pcrel_offset */ + HOWTO (R_RISCV_TLSDESC, /* type */ + 0, /* rightshift */ + 0, /* size is handled by dynamic linker */ + 0, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_dont, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_RISCV_TLSDESC", /* name */ + false, /* partial_inplace */ + 0, /* src_mask */ + MINUS_ONE, /* dst_mask */ + false), /* pcrel_offset */ + /* Reserved for future relocs that the dynamic linker must understand. */ - EMPTY_HOWTO (12), EMPTY_HOWTO (13), EMPTY_HOWTO (14), EMPTY_HOWTO (15), @@ -879,6 +892,62 @@ static reloc_howto_type howto_table[] = 0, /* src_mask */ 0, /* dst_mask */ false), /* pcrel_offset */ + + HOWTO (R_RISCV_TLSDESC_HI20, /* type */ + 0, /* rightshift */ + 4, /* size */ + 32, /* bitsize */ + true, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_signed, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_RISCV_TLSDESC_HI20", /* name */ + true, /* partial_inplace */ + 0, /* src_mask */ + ENCODE_UTYPE_IMM (-1U), /* dst_mask */ + false), /* pcrel_offset */ + + HOWTO (R_RISCV_TLSDESC_LOAD_LO12, /* type */ + 0, /* rightshift */ + 4, /* size */ + 32, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_signed, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_RISCV_TLSDESC_LOAD_LO12", /* name */ + false, /* partial_inplace */ + 0, /* src_mask */ + ENCODE_ITYPE_IMM (-1U), /* dst_mask */ + false), /* pcrel_offset */ + + HOWTO (R_RISCV_TLSDESC_ADD_LO12, /* type */ + 0, /* rightshift */ + 4, /* size */ + 32, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_signed, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_RISCV_TLSDESC_ADD_LO12", /* name */ + false, /* partial_inplace */ + 0, /* src_mask */ + ENCODE_ITYPE_IMM (-1U), /* dst_mask */ + false), /* pcrel_offset */ + + HOWTO (R_RISCV_TLSDESC_CALL, /* type */ + 0, /* rightshift */ + 0, /* size */ + 0, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_dont, /* complain_on_overflow */ + bfd_elf_generic_reloc, /* special_function */ + "R_RISCV_TLSDESC_CALL", /* name */ + false, /* partial_inplace */ + 0, /* src_mask */ + ENCODE_ITYPE_IMM (-1U), /* dst_mask */ + false) /* pcrel_offset */ }; /* A mapping from BFD reloc types to RISC-V ELF reloc types. */ @@ -925,6 +994,10 @@ static const struct elf_reloc_map riscv_reloc_map[] = { BFD_RELOC_RISCV_TPREL_LO12_I, R_RISCV_TPREL_LO12_I }, { BFD_RELOC_RISCV_TLS_GOT_HI20, R_RISCV_TLS_GOT_HI20 }, { BFD_RELOC_RISCV_TLS_GD_HI20, R_RISCV_TLS_GD_HI20 }, + { BFD_RELOC_RISCV_TLSDESC_HI20, R_RISCV_TLSDESC_HI20 }, + { BFD_RELOC_RISCV_TLSDESC_LOAD_LO12, R_RISCV_TLSDESC_LOAD_LO12 }, + { BFD_RELOC_RISCV_TLSDESC_ADD_LO12, R_RISCV_TLSDESC_ADD_LO12 }, + { BFD_RELOC_RISCV_TLSDESC_CALL, R_RISCV_TLSDESC_CALL }, { BFD_RELOC_RISCV_ALIGN, R_RISCV_ALIGN }, { BFD_RELOC_RISCV_RVC_BRANCH, R_RISCV_RVC_BRANCH }, { BFD_RELOC_RISCV_RVC_JUMP, R_RISCV_RVC_JUMP }, diff --git a/bfd/libbfd.h b/bfd/libbfd.h index a84febd8257..62e0d43d2ab 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -2408,6 +2408,10 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", "BFD_RELOC_RISCV_TLS_DTPREL64", "BFD_RELOC_RISCV_TLS_TPREL32", "BFD_RELOC_RISCV_TLS_TPREL64", + "BFD_RELOC_RISCV_TLSDESC_HI20", + "BFD_RELOC_RISCV_TLSDESC_LOAD_LO12", + "BFD_RELOC_RISCV_TLSDESC_ADD_LO12", + "BFD_RELOC_RISCV_TLSDESC_CALL", "BFD_RELOC_RISCV_ALIGN", "BFD_RELOC_RISCV_RVC_BRANCH", "BFD_RELOC_RISCV_RVC_JUMP", diff --git a/bfd/reloc.c b/bfd/reloc.c index 07d35e45c8b..38e1bdfc754 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -5016,6 +5016,14 @@ ENUMX BFD_RELOC_RISCV_TLS_TPREL32 ENUMX BFD_RELOC_RISCV_TLS_TPREL64 +ENUMX + BFD_RELOC_RISCV_TLSDESC_HI20 +ENUMX + BFD_RELOC_RISCV_TLSDESC_LOAD_LO12 +ENUMX + BFD_RELOC_RISCV_TLSDESC_ADD_LO12 +ENUMX + BFD_RELOC_RISCV_TLSDESC_CALL ENUMX BFD_RELOC_RISCV_ALIGN ENUMX diff --git a/include/elf/riscv.h b/include/elf/riscv.h index 0aa8b3359c4..f32215f5d95 100644 --- a/include/elf/riscv.h +++ b/include/elf/riscv.h @@ -44,6 +44,7 @@ START_RELOC_NUMBERS (elf_riscv_reloc_type) RELOC_NUMBER (R_RISCV_TLS_DTPREL64, 9) RELOC_NUMBER (R_RISCV_TLS_TPREL32, 10) RELOC_NUMBER (R_RISCV_TLS_TPREL64, 11) + RELOC_NUMBER (R_RISCV_TLSDESC, 12) /* Relocation types not used by the dynamic linker. */ RELOC_NUMBER (R_RISCV_BRANCH, 16) @@ -90,6 +91,10 @@ START_RELOC_NUMBERS (elf_riscv_reloc_type) /* Reserved 59 for R_RISCV_PLT32. */ RELOC_NUMBER (R_RISCV_SET_ULEB128, 60) RELOC_NUMBER (R_RISCV_SUB_ULEB128, 61) + RELOC_NUMBER (R_RISCV_TLSDESC_HI20, 62) + RELOC_NUMBER (R_RISCV_TLSDESC_LOAD_LO12, 63) + RELOC_NUMBER (R_RISCV_TLSDESC_ADD_LO12, 64) + RELOC_NUMBER (R_RISCV_TLSDESC_CALL, 65) END_RELOC_NUMBERS (R_RISCV_max) /* Processor specific flags for the ELF header e_flags field. */