From patchwork Fri Jan 5 21:50:13 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: 56579 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 259203857B8B for ; Fri, 5 Jan 2024 21:50:59 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id E55213858C56 for ; Fri, 5 Jan 2024 21:50:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E55213858C56 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 E55213858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704491420; cv=none; b=Pxz4Lr/9B0epQsOOpp3hkZ8/t/yBaZB4FvUeQP8UzDflLKo5H9z05ZEhvnGJ4CLrbBagV3nZvnQLUrTwf/FW1HToIjmJt/koesco5hBcyYzEswvNfzh4wAmvXptFasW22yotmITRjtlHXlCruC4Wu6UHW8nrjDttu5dHABGCVDA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704491420; c=relaxed/simple; bh=CElY6gGXuSIYQgvEH+sFzD450RTKJqTwu3gc82XM9S0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=g0g8u1xKXJL4kN8jbSstjOgglGhcRa6Lk2ljPmgVJBYM6orZ5ecupXiONoDBIhbr1e3EGhZ8wVwfKVnhen0uTNxTcGlHL4u6v069MCdFK9fH4oCPlusXny7NVOFyfpUQob/tPb8y5uGJVyzeSmerUviJjINXybaQj6Fr77X2d8o= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6d9a795cffbso47493b3a.0 for ; Fri, 05 Jan 2024 13:50:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704491418; x=1705096218; 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=QlPCfJb9FKz6foSIMCCHhkCl9R9Ub7y15xkGK4Ksbnk=; b=RQS4Xhr2Th0eYQlE0sgubmuJGBAj4AdmDIPlLPk9Ei6a96x8GXYrkh7ZwwL+3rInbx 5Qc196hygli97bnQG6khVeLWruY11S6CwZF2ktCZ8xcB9bIDvMhdDfJkGUIxI3q41QyH yr9rPN9Wrr4uWa7jEeKbSW570HXsFxsOTQGZsTb4kcG9C/YJc+HtKcNceeYkyUiT5XC7 ggRy8YOZK8ugAWZVFCXezVhPDCWaQ8MYI2e9qJZEUKPAolfOfPSRHLbBd+LJ31saxWrg zukl8MaNubALLl7DM1fmQqv/glEhKA5b3W649O5S3N0ZmvfL/yyWGlBEZNzoOQDDYXqI fr7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704491418; x=1705096218; 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=QlPCfJb9FKz6foSIMCCHhkCl9R9Ub7y15xkGK4Ksbnk=; b=Y7ngUFeZpWrVYEjmuUnw/kcmMXmOcvgK2utWlBkqRwOg1Aajw+b3wtlDcclwyGsNF+ 3hdyx4sWp/pV6ckRfqFQ3zqj3rjTcytEYU4mjJ/inxZgI/Ayu9/xfP0waSKOq5NapEWX HycT1V3Z9e4gAgh5hY54xLHUnFoAZZfBgpeVdV2yhKFboobmSPue27SwzqFP7MnhR/MF vdNATsABVRnNlSotjtPV5ftynCB8YQ16jVc1n/N8VXjQpJNMcJOy4eG7OdhBmbWcAzMn cEN7TQfW+PeIDTqWbc7t724x4ZYrPHtR8S84FoI4qWGs6PKyU6yf2R4EFJURCtj+Zngw d1tQ== X-Gm-Message-State: AOJu0YwJ6uLiGgGYJVAeua8L1oYCY+rBicJhrnKKlgeAQhqFqM2nYSIm WXiN8ElG1eKEcfj6M127/EMWYp3wzqk= X-Google-Smtp-Source: AGHT+IF8sVcr7eFsygtlaYJiuGSwKbLv5eI4cHt+CdBhXDATEx3ShZNaeXNGPYNIdUciCbnoBTI7lg== X-Received: by 2002:a05:6a00:4bab:b0:6d9:a856:eec2 with SMTP id kt11-20020a056a004bab00b006d9a856eec2mr132145pfb.14.1704491417613; Fri, 05 Jan 2024 13:50:17 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.169.119]) by smtp.gmail.com with ESMTPSA id lo2-20020a056a003d0200b006d9bdc0f765sm1832955pfb.53.2024.01.05.13.50.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 13:50:17 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 7FFF57402F4 for ; Fri, 5 Jan 2024 13:50:15 -0800 (PST) From: "H.J. Lu" To: binutils@sourceware.org Subject: [PATCH 0/2] Improve -z mark-plt Date: Fri, 5 Jan 2024 13:50:13 -0800 Message-ID: <20240105215015.1123568-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3018.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, 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: 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+patchwork=sourceware.org@sourceware.org Add --enable-make-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-make-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-elf/indirect-extern-access-2.rd | 2 +- ld/testsuite/ld-elf/pr23161d.rd | 2 +- ld/testsuite/ld-ifunc/ifunc-16-x86-64-now.d | 2 +- ld/testsuite/ld-ifunc/ifunc-16-x86-64.d | 2 +- .../ld-ifunc/ifunc-2-local-x86-64-now.d | 2 +- ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d | 2 +- ld/testsuite/ld-ifunc/ifunc-2-x86-64-now.d | 2 +- ld/testsuite/ld-ifunc/ifunc-2-x86-64.d | 2 +- ld/testsuite/ld-ifunc/ifunc-20-x86-64.d | 2 +- ld/testsuite/ld-ifunc/ifunc-25c-x86.d | 2 +- ld/testsuite/ld-ifunc/ifunc-5b-x86-64.d | 2 +- ld/testsuite/ld-ifunc/pr17154-x86-64-now.d | 2 +- ld/testsuite/ld-ifunc/pr17154-x86-64.d | 2 +- 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 | 47 +++++- 26 files changed, 281 insertions(+), 83 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