From patchwork Sat May 21 02:23:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 54257 X-Patchwork-Delegate: fweimer@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D1F2F38337BD for ; Sat, 21 May 2022 02:24:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D1F2F38337BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1653099840; bh=nNkAVK+o/+/283OrVEv0wsDmpacLAG/FxVRqdZw5fok=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=fr9kxjbWafNTS+zb6brxJMqjlkJeYob4/xNS0F9BcDYzCxec2viW/Cs6MyLgVMnVP K0K6h2WjCB6OQArARpo+UM2ognoiQ1iu8d4R5leaQaL3fySqBVt1Bd/5bFEgyZls5o j5vZBXsnbmcz6yHoPJNLLtAKU9ISUKufdrT0lwnk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 1A7E8385740D for ; Sat, 21 May 2022 02:23:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1A7E8385740D Received: by mail-pf1-x433.google.com with SMTP id h13so2845104pfq.5 for ; Fri, 20 May 2022 19:23:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=nNkAVK+o/+/283OrVEv0wsDmpacLAG/FxVRqdZw5fok=; b=brYr1rBDWN6YSeIWXrUu6Z5t0jb+UpnrdFzPSAkr4JlB+vdbupAQr5HoTp7+EHRfMl g29Jh/0+rg5SFVxslRkG7RcCB/LbXseDPsZrv2d3GMrW7xK8mHbTXuFqm2P66oTy8SFl 1SjGrr1hYl26pWlrGvkSH8X0istM/7hgoRuzjZOe25/RvvqSpTR4AqlQupLU2pTKrtT5 PtmkqxRGeNVGfKpL4xFJ0uOLP52iJkraMY3jjYB/4NRi9JWdeGGCemZeMvLBhKfX3OTv 7z6pJTizC7nM2nH4XV1g3PF1Uod++bS6CnHps/p3FsnXfasWaSDGGexwaj6e6ksjKfEg MOAA== X-Gm-Message-State: AOAM533ZLwAHKeLURFYTM6Y8z1jaGQPkNFmbhV/69AaBDKPB5R3PHSqM 45O3uYFKeYQMX3F5pWSVZdu90bQim0g= X-Google-Smtp-Source: ABdhPJy3uNFRT/szy4GiWWlCaPHLX5zaO3WXGTtUmWacZHh3JZPw66/kmbEWreQJ6flwiiissPNX8Q== X-Received: by 2002:a62:8686:0:b0:518:29a8:93b5 with SMTP id x128-20020a628686000000b0051829a893b5mr12732207pfd.71.1653099818386; Fri, 20 May 2022 19:23:38 -0700 (PDT) Received: from gnu-tgl-2.localdomain ([172.58.88.122]) by smtp.gmail.com with ESMTPSA id n10-20020a170903404a00b00161435e7475sm391223pla.157.2022.05.20.19.23.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 May 2022 19:23:38 -0700 (PDT) Received: from gnu-tgl-2.. (localhost [IPv6:::1]) by gnu-tgl-2.localdomain (Postfix) with ESMTP id DA4B7300506 for ; Fri, 20 May 2022 19:23:36 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH] x86-64: Ignore r_addend for R_X86_64_GLOB_DAT/R_X86_64_JUMP_SLOT Date: Fri, 20 May 2022 19:23:36 -0700 Message-Id: <20220521022336.2464080-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3028.1 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" According to x86-64 psABI, r_addend should be ignored for R_X86_64_GLOB_DAT and R_X86_64_JUMP_SLOT. Reviewed-by: Fangrui Song --- sysdeps/x86_64/dl-machine.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index c70af7ab1e..7f607f6dff 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -325,11 +325,13 @@ and creates an unsatisfiable circular dependency.\n", # endif /* Set to symbol size plus addend. */ value = sym->st_size; + *reloc_addr = value + reloc->r_addend; + break; # endif - /* Fall through. */ + case R_X86_64_GLOB_DAT: case R_X86_64_JUMP_SLOT: - *reloc_addr = value + reloc->r_addend; + *reloc_addr = value; break; case R_X86_64_DTPMOD64: