From patchwork Thu Jan 5 23:07:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 39834 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp535864wrt; Thu, 5 Jan 2023 15:07:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXvCwJL02Q+uhKUmVEabDd/nexANwfGV5XjgfpegKFkgVWQ/qsSVJOj1BXM6dNSumxNZhXFO X-Received: by 2002:a17:907:8b0a:b0:7c0:ae13:7407 with SMTP id sz10-20020a1709078b0a00b007c0ae137407mr50192533ejc.3.1672960076906; Thu, 05 Jan 2023 15:07:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672960076; cv=none; d=google.com; s=arc-20160816; b=H4ykzEJdDp0lisdSwBbig4R5oJFjAsCKAf09jK+ApWhNSlXbtY+O2iqkvrZBWw04Cv xeWgZbbtDbnxZ4cQD1qHJw1Vo5H13RaUjnSDT70XdkV2eqXyCnXKo4oNaOrTNqbDZRr3 qZAP8CgGfbUPJRWelSdOYdfObEMOmSuhoajV3MsuuR7I7GM9FfUW08vbSNgSk3rCgko8 EPIMGdyqD6yAkn3P5BXBkWvDMYGitn04WwMsem0OEvWpczsUoo2cetXGpQJ4UEgUjdRq SVuh0bOW+LkNZqR+IsbeNTgt2yH/I2rW5kcxpdY6TbKiosWSYiNWAzQSxDOYfSkNjMLp mN7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:cc:to:subject :message-id:mime-version:date:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=nGhbyp7ZSjBW0D+QxjwugH2B8j2ErlAvtZ5lcNkV8VE=; b=04IAdhmCPK8uKYHLaeLOgjHslTFomQzpi+0L0zD0hwXiYTsknvV1RNUkPeajPzSOuF KvdoJNxI92HNNUvpnlKPTD0Gv6Xr5uQnUPQvkO/ZGdgBydC2aZ1oJXHsdFrEx8JWneCS pJN5/Y5R4VSZ/eYARM8XadvcmWmfTbNZl3p+mZ1d9M+g6Tynkqzfqs7agrvI7zYgUMOJ dIA7lEu/JxJ40QjsMzH8KpKmIRKgH4pWnKyLg9TtSQSfSxBLTEp+9c6HHMxJUbNx1f8u /7pf+21+zINmUJf8Y1CJ5L9H8zV+33JNEwdaQEisd3Lsa7JUNuuiBK/UoNJW8Al8qdez rIDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=frCsD2WQ; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id qk43-20020a1709077fab00b007be1d7d1c22si34474111ejc.32.2023.01.05.15.07.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jan 2023 15:07:56 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=frCsD2WQ; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c 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 ACB6A3858C74 for ; Thu, 5 Jan 2023 23:07:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ACB6A3858C74 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672960075; bh=nGhbyp7ZSjBW0D+QxjwugH2B8j2ErlAvtZ5lcNkV8VE=; h=Date:Subject:To:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=frCsD2WQjPPiGS0UQ8tYU8dB/Kc0otU0U+q+i+k745kXmKNUp/ynHjQsAooGMxxG/ wftd1k/YZFeH9VG0KE6W1sxFHw9QdZ6x9xi12u/Fy2gJ9dN4iHvKao0fGnXMf3L9Lc 4uVuBlBzLfPU41yICdU+5BGlc2cQNaJOQ/SsWOtU= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by sourceware.org (Postfix) with ESMTPS id 0FA5E3858D28 for ; Thu, 5 Jan 2023 23:07:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0FA5E3858D28 Received: by mail-yb1-xb49.google.com with SMTP id v13-20020a25ab8d000000b007b54623bf71so174036ybi.2 for ; Thu, 05 Jan 2023 15:07:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=nGhbyp7ZSjBW0D+QxjwugH2B8j2ErlAvtZ5lcNkV8VE=; b=f0rXtPUBMZ9Dvmz5cDNwNDFj+dFQEhyAPzZHuvQtQM+LdH77sAdO/IYr3x9PcZ21iD tB8tYZYee+3KGGD3Yapi3BGFQqAakbBLjZY+hkXdBy4i1X1xMt3GlJpixRltDcPidCVh 4/7QbnGow/QIUmD+EODJt5GZyizXiQJxAz6bWXc2/I6UpOjJZGSIr5IdOwKWBQNtfUuz 8l7ujXa2S/C9v3Dixkl24BXxqWjyL7A218C7hgJ6wj9LSJcrenVWCXzqz9Num8vApbw0 eljZ1hSZQ+t9zGMgXm6yY2sMEiqNlkHNAI3VbZ58e6gDxCV7TM/RbTGtY8ilQTjAR7gz cbag== X-Gm-Message-State: AFqh2ko4TG3Bm27f81fNnEkdhgcuZ8ELgpTA/BiVfftQ3/lkb1HaL8m0 P6RIubkIkj/ZIelj/NGTmQAX/CkFV2cVaj3q+knBD7FJg6mTFT/4MGrT5/RRT9dTuqSAB4WSI2q BDxSY61gUDNlkqvo+/3lSoZbOQaMSMIzdiBnnnnEhzKfHTQlcVd9AP0aeHA2O2POBmw== X-Received: from maskray.svl.corp.google.com ([2620:15c:2d3:205:c2de:536f:e9be:ca87]) (user=maskray job=sendgmr) by 2002:a81:128f:0:b0:472:269a:52cb with SMTP id 137-20020a81128f000000b00472269a52cbmr5010703yws.88.1672960066444; Thu, 05 Jan 2023 15:07:46 -0800 (PST) Date: Thu, 5 Jan 2023 15:07:42 -0800 Mime-Version: 1.0 Message-ID: <20230105230742.1097314-1-maskray@google.com> Subject: [PATCH] ld: Allow R_386_GOT32 for call *__tls_get_addr@GOT(%reg) To: binutils@sourceware.org Cc: Fangrui Song X-Spam-Status: No, score=-20.0 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL 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.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Fangrui Song via Binutils From: Fangrui Song Reply-To: Fangrui Song Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754225785621656268?= X-GMAIL-MSGID: =?utf-8?q?1754225785621656268?= Similar to https://sourceware.org/pipermail/binutils/2023-January/125506.html (x86_64). _Thread_local int a; int main() { return a; } % gcc -m32 -fno-plt -fpic a.c -fuse-ld=bfd -Wa,-mrelax-relocations=no /usr/bin/ld.bfd: /tmp/ccR8Yexy.o: TLS transition from R_386_TLS_GD to R_386_TLS_IE_32 against `a' at 0x15 in section `.text' failed /usr/bin/ld.bfd: failed to set dynamic section sizes: bad value collect2: error: ld returned 1 exit status This commit fixes the issue. PR ld/24784 * bfd/elf32-i386.c (elf_i386_check_tls_transition): Allow R_386_GOT32. --- bfd/elf32-i386.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 9e398eacb81..f0de1c62a5e 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -963,7 +963,8 @@ elf_i386_check_tls_transition (asection *sec, || !((struct elf_x86_link_hash_entry *) h)->tls_get_addr) return false; else if (indirect_call) - return (ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32X); + return (ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32X + || ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32); else return (ELF32_R_TYPE (rel[1].r_info) == R_386_PC32 || ELF32_R_TYPE (rel[1].r_info) == R_386_PLT32);