From patchwork Sat Jan 6 22:09:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 18788 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:37c1:b0:101:2151:f287 with SMTP id y1csp300126dyq; Sat, 6 Jan 2024 14:10:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IF88RWlUFdY171ytFhUpo+wlNXvnLXQAD4/ETlBoFQExZGwDR5ody9b0Q3NNHL9vqRMJKk2 X-Received: by 2002:ae9:e703:0:b0:781:9e55:b34f with SMTP id m3-20020ae9e703000000b007819e55b34fmr5321762qka.4.1704579016670; Sat, 06 Jan 2024 14:10:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704579016; cv=pass; d=google.com; s=arc-20160816; b=qFz4wk1iuBDGhaPqdT65VfCVFilsLt5iD2J0KKkxXrfVq4IfohNprNyoShR1bE2zlX ibrb96L5fxTCw8IMd6+lr99RGOtlGzlVaiTouynciaNuqizw1MX1aV8Ouur7I2cbYY0I hyiKZC+hnJHTw9ZO9oUmXRaWvag39H0ss+GGGqFMSYdjl1FtllDRrb8NeGifmuvSw1gq QHksfAU3ooBviOJHgdUM+QN7wPyEgiYizogkgGvrLmHyFiRYZYubwrR2SAzkWA5KA0oC 9BDpe/07wMRFVuDAnTLUSDmJU+kLWsEFM1RFZMrVbwRf2sA35EW3Tm2umsWWgC/6UuR4 pG+Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=5WhMPbT3MXVxZr7JvX7/M4/bWpgKN+pdXy1H7M/YbHI=; fh=NLxAvL/bDfPg4AGOtxqvQlND8vazkZrNzKLY8+LAbBY=; b=FueHyR8shGbjWuNUzeMLaFOGIWUXKOakibpqnUZSqINI0ikXPJTeNvUOyfONnpq95G MlCrkgbYvTamjGmSfwuycRGIhmN5Ptc0RbrWxifATDPVtU7eH+/Ca0n+hqaKsyFVXQPG UArlR2zTxiOqLstJ2e6A7k7CjJ2Wn5gzi22ADDfFtXClm93oKjFCld0nfkzQWXt77/8o HZfjEi9wV5gvFjNhK2fBT1uDR7BrZA1S1ybZdH+Kptv829RgSfeBQ81O3EM39nP8ZZaA ssxb66zWHib3bvxpRiK+fFz5Gb2q5Gax8eOaCXp18/sHACAJcQjMhLmucv6HiPXp9e0j mONQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=CSEzT6B+; arc=pass (i=1); 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id x8-20020a0cda08000000b0067f9f2b96e3si4745627qvj.221.2024.01.06.14.10.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jan 2024 14:10:16 -0800 (PST) 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=@gmail.com header.s=20230601 header.b=CSEzT6B+; arc=pass (i=1); 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5CD09386100C for ; Sat, 6 Jan 2024 22:10:16 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id B7F993858C30 for ; Sat, 6 Jan 2024 22:10:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B7F993858C30 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 B7F993858C30 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::635 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704579007; cv=none; b=bsJffNFR3VoixnaOShi9q6Jsob5lD1jsxmKBAz5bsgb24K7wbjw1bOZNTOFJTT9VsJLZT2URAuDZ+vesApy0vtamfeffceIBbaeHfF3NrTf3/Vq9BWIO9Ptdsg1wnqJJbNqa5G/mDVjDrKY4Y3eG0/uN/JcP26LLXsBbJVAbK0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704579007; c=relaxed/simple; bh=2roA0yYPnYH7Tr3oRdbJXQ993TX3PuCJQQ+IYKx3NjU=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=GILYoiAnMbA1GNLgIUssiwfbnEZVFz/D8aXnKURKBPbpkxgrutQC5EoDsuYYltlKOnKOSiYvK6dxwGTTkgr4AjUMPZj8oDiop4hce1sIuOf8HJdfciJTM6IhTla/p+tZ2Fq1PiunLYAhiIvDt1lwUwcJ24Jqdbbx2x8c+DY5COo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1d50d0c98c3so2791155ad.1 for ; Sat, 06 Jan 2024 14:10:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704579004; x=1705183804; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=5WhMPbT3MXVxZr7JvX7/M4/bWpgKN+pdXy1H7M/YbHI=; b=CSEzT6B+qHFunkM/UC813sLRWizZlEuvzrafkj1RwWLcQmiYfXGh1UYiKGdx1WIhVw QGOWAOUrSvOLVLB3bUanoXuhRzjO/T8vB5/Q9VtfTanFnnWKivBoMs+YyMDvDcgvybdJ Xy3kKg4P1czr+nqPnQ+mRR+Yc1lIbmIt1vfE3BHCJRaV0vpzsaeQ4p3d2Dgr18zvcsz6 ZYhEaHJFKWIfhCfBIAWcHJDlLKjCqI5xPSfYb7VO1IaEWWPN7GCHzso6nhmVjUxcfiWS X6Rhll5OSB5Awx+LhHrtesh0M++8ONu5l0NKWV1M5PEC/Hs9zC+N0w7/t6+a9a3Izftq 1jlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704579004; x=1705183804; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5WhMPbT3MXVxZr7JvX7/M4/bWpgKN+pdXy1H7M/YbHI=; b=UjxRnVkCML+UZ94h5zB9yLGno5E0HX8y/BTWowDrjflJYXG+C15Pczn3/uR0VaDEXh bWq7nEALdki89+PeQvWtdCxf0Ca3wVrZ+2nOZYNZoiMazAv7IY5lewO7nZ1TJ64AtTZR f7uAnn8/BB/gJ7iDq3/O4D1zb56yVPJPMLOJ+v2OvgyJbwgP/TQ4tg/qA5/P2s0LV/JC afRvKeHOjHBY50tiK8cy9OtlYYwGCHCD44/LisFggLKB1afXkUsJ6UwmyaAqWNiS5SgI iEgod2OfLTNRx7+NcwFd/eMQIskZc2lO1JfssNKO9cb80BZx1uOp45aAovffxChhP/PP q9Gw== X-Gm-Message-State: AOJu0Yyf1xnFJ3/4gHyatAbcvPc44UuyePnLNF0wD913qCP3qbRmW+hW SG8Kml7YD2TLWRRHyF7K/ou3AtWWS9w= X-Received: by 2002:a17:902:da85:b0:1d4:1044:87d4 with SMTP id j5-20020a170902da8500b001d4104487d4mr1978746plx.19.1704579004164; Sat, 06 Jan 2024 14:10:04 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.169.119]) by smtp.gmail.com with ESMTPSA id ay3-20020a1709028b8300b001d43872309asm3463459plb.286.2024.01.06.14.10.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jan 2024 14:10:03 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id E39987402F4 for ; Sat, 6 Jan 2024 14:10:01 -0800 (PST) From: "H.J. Lu" To: binutils@sourceware.org Subject: [PATCH v2 0/2] Improve -z mark-plt Date: Sat, 6 Jan 2024 14:09:59 -0800 Message-ID: <20240106221001.1754844-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3013.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=no 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: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787380646869340631 X-GMAIL-MSGID: 1787380646869340631 Changes in v2: 1. Fix typos. It should be --enable-mark-plt, not --enable-make-plt. 2. Remove tests changes for -z mark-plt. Add --enable-mark-plt linker configure option to mark PLT entries with DT_X86_64_PLT, DT_X86_64_PLTSZ and DT_X86_64_PLTENT dynamic tags by default. When -z mark-plt is used to add DT_X86_64_PLT, DT_X86_64_PLTSZ and DT_X86_64_PLTENT, the r_addend field of the R_X86_64_JUMP_SLOT relocation stores the offset of the indirect branch instruction. However, glibc versions which don't have this commit in glibc 2.36: commit f8587a61892cbafd98ce599131bf4f103466f084 Author: H.J. Lu Date: Fri May 20 19:21:48 2022 -0700 x86-64: Ignore r_addend for R_X86_64_GLOB_DAT/R_X86_64_JUMP_SLOT According to x86-64 psABI, r_addend should be ignored for R_X86_64_GLOB_DAT and R_X86_64_JUMP_SLOT. Since linkers always set their r_addends to 0, we can ignore their r_addends. Reviewed-by: Fangrui Song won't ignore the r_addend value in the R_X86_64_JUMP_SLOT relocation. Although this commit has been backported to glibc 2.33/2.34/2.35 release branches, it is safer to require glibc 2.36 for such binaries. Extend the glibc version dependency of GLIBC_ABI_DT_RELR for DT_RELR to also add GLIBC_2.36 version dependency for -z mark-plt on the the shared C library if it provides a GLIBC_2.XX symbol version. H.J. Lu (2): elf: Add elf_backend_add_glibc_version_dependency ld: Add --enable-mark-plt configure option bfd/elf-bfd.h | 23 ++++ bfd/elf64-x86-64.c | 27 +++++ bfd/elflink.c | 146 +++++++++++++++----------- bfd/elfxx-target.h | 5 + ld/NEWS | 5 + ld/config.in | 4 + ld/configure | 26 ++++- ld/configure.ac | 17 +++ ld/emulparams/x86-64-plt.sh | 7 +- ld/emultempl/elf-x86.em | 17 +++ ld/testsuite/ld-x86-64/mark-plt-1a.rd | 7 ++ ld/testsuite/ld-x86-64/mark-plt-1b.rd | 7 ++ ld/testsuite/ld-x86-64/x86-64.exp | 14 +++ 13 files changed, 240 insertions(+), 65 deletions(-) create mode 100644 ld/testsuite/ld-x86-64/mark-plt-1a.rd create mode 100644 ld/testsuite/ld-x86-64/mark-plt-1b.rd