From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=flex--maskray.bounces.google.com Received: by mail-yb1-xb49.google.com with SMTP id v13-20020a25ab8d000000b007b54623bf71so174036ybi.2 for ; Thu, 05 Jan 2023 15:07:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=nGhbyp7ZSjBW0D+QxjwugH2B8j2ErlAvtZ5lcNkV8VE=; b=sOXquK734IzXdKde7SGFWjlEFbHbdorLStILzjGWxPzs+6L6PxYMUv/cH2DemoitJS fy0RPv303GyGkF2kwOPPT0Ggwv5LN51mXV37Qo1E0oJyRzP1SpiltwzBQvrfqtNZyUAL y+wmfHfpyyAIOFVmzDf8NdMoUzQuIg/zldcMFMMUjAygvTWDysgO+SVvzC9TnXUDfUkl pAcrUBYyHckBL7QRa7yiTqd4FFKv5KBPdvXOWp8f/klO1/+na0DOgtlMB4/ULHeDKwOj ZMliipyFhGJrGDjAJrjNgpyn05y6jlbtD9W4QAF/C0hKEHtxk0UwNllFtDKC31vWrn2y TIHQ== 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-Google-Smtp-Source: AMrXdXs1bRoO71hJFIMsUz7QW4SQjdsMz3TQ9WgrLGHlvTKCRch5HQoyDp8hNXYundzf/c6kCdAyBklQ/0xW 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) From: Fangrui Song To: binutils@sourceware.org Cc: Fangrui Song Content-Type: text/plain; charset="UTF-8" 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 List-Id: 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); -- 2.39.0.314.g84b9a713c41-goog