From patchwork Thu Jul 18 17:34:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 13736626 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 83F6DC3DA49 for ; Thu, 18 Jul 2024 17:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:Mime-Version:Date:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=2bPXOft7a0DVPxryCI2cNdVhhqnEsyUQPtbGOfbLI5A=; b=Bcxc4xllWtWlgAte/xRwxwxlFm /7DJE9OA1buedxZ/MltU8/0XJVH900t0MD1S+CZxezuCSiEQUgvzLkptlqDuY0lKxzYmwoHdWIRP6 NsrdkMJ3UK2a5WX1J0RCebdrg2hGIamFNPL52nu4yEuB7wi0qzRRXRemzlhboOcU+SOzwjS7+BJnE XrAYG+x3kE7z1vk4Hc0nS3GGqNsPLKCwie4nM5In4TMEsc0PyxcLEu579THY09AWRV9PvmM5XAHUV eckInbsGZw5P9Yg7Mmu2NiOX2QDSkjrWpp2YQnI1Wfp+NtTR7yPL/6cqL3TZ6s9Bb1fHmqNfn1eNm fS3sOJBA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUV1q-0000000071v-1JF5; Thu, 18 Jul 2024 17:34:54 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUV1U-000000006wd-0OAF for linux-arm-kernel@lists.infradead.org; Thu, 18 Jul 2024 17:34:33 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-668e964ffd9so8400177b3.3 for ; Thu, 18 Jul 2024 10:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1721324070; x=1721928870; darn=lists.infradead.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=2bPXOft7a0DVPxryCI2cNdVhhqnEsyUQPtbGOfbLI5A=; b=UELuI0HtBdRCTiR8onue1Vs2Bw9DWc1fcFwBisp70gWj1pyqf69dUBEwGotckG1mLD 8Q3cE4Xkl6IZjuX7hGeKLMNyh7fPfqEATNvfsLeFl3CluxYkEck3q3HHvxwRO4q7VTyi uzopMf5vWJisNbs0Z9E0H7RbPQi3iD+ygSHtRLpT40dJ4GqNvixAm7qQnFGdrg7MlZx3 Sx9SkZr0Z3QVIxRzSXy3LpualpIIiFPWCtQXfYB1rIp0xnUVt9d++0bM+fxGuNwDltng scxixpwb/HVBC6/5fzMUunuEJMLKmBDjmuiBpc5QisGFaPM4SDZCnvDqAIRJ4iCcPv7S muKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721324070; x=1721928870; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=2bPXOft7a0DVPxryCI2cNdVhhqnEsyUQPtbGOfbLI5A=; b=HJHMMi/gyIi95Gm8snG4/KXxp8KqiCK88N9V6V08cHaJhaP8fg4I27L49CFfNO1iCq De7AcjGAM9F308q1syQrsY47hKYiG0oVMGZSHUhM/ruPkDJD6fIefaJvxBYLXjQneIrF MOeXCaDNHqQIQv/ec1CrmpI5VYg/zivh1r7Huu3vF/kZLXKrUVo0BO89JSBbu9T8X1V4 G+oXo3hR7sjOAaO5kB8ncM0V69ZsDZoNC3KGbYdaM9/rGePZl9JTDfJf94GoNEWPbbbm L00hl5RzxYVnHT5Gm3cWIotLP1vCObwy+UsXZMJk3vLomcYQt7krgyMcszDELmxpdimM t2Zg== X-Forwarded-Encrypted: i=1; AJvYcCVb6f621HFF+XHoP43+h6ixv3o4Mlldp1A0/U8YF3vmfR1vsz6U9DmkGR2ddv30ZW0WLLsxQ/LCB5WZybIQ3ukGYH00uLRQwNVAQ2pWTgNDQpayCcs= X-Gm-Message-State: AOJu0YyC6W5O5PYTZo9C5LK5zmM9Oa8WU7WCysTrh89fxECHPEdw+lFY EB7bANO8lxVSKfhmFzHaPgT6Hnv8tKOnzTm3b83imJNS5cYthpYppWfHCghxr3MBnlw9T6ovuOm /EuKq9w== X-Google-Smtp-Source: AGHT+IFTq+/cpSAPzHRrHWCy4g9drFEpQsAZ1O48hw2tifp6CjMKfyB846WCIKQEGoJuuPOHlISWzdbhuGbb X-Received: from maskray.svl.corp.google.com ([2620:15c:2d3:205:3158:f77d:549c:7b32]) (user=maskray job=sendgmr) by 2002:a05:690c:3:b0:650:a16c:91ac with SMTP id 00721157ae682-666040cca3amr2358647b3.8.1721324069699; Thu, 18 Jul 2024 10:34:29 -0700 (PDT) Date: Thu, 18 Jul 2024 10:34:23 -0700 Mime-Version: 1.0 Message-ID: <20240718173423.1574395-1-maskray@google.com> Subject: [PATCH] arm64/vdso: Remove --hash-style=sysv From: Fangrui Song To: Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Fangrui Song X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240718_103432_153860_F35AAB9F X-CRM114-Status: GOOD ( 11.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org glibc added support for .gnu.hash in 2006 and .hash has been obsoleted for more than one decade in many Linux distributions. Using --hash-style=sysv might imply unaddressed issues and confuse readers. Just drop the option and rely on the linker default, which is likely "both", or "gnu" when the distribution really wants to eliminate sysv hash overhead. Similar to commit 6b7e26547fad ("x86/vdso: Emit a GNU hash"). Signed-off-by: Fangrui Song --- arch/arm64/kernel/vdso/Makefile | 2 +- arch/arm64/kernel/vdso32/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile index d63930c82839..d11da6461278 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -21,7 +21,7 @@ btildflags-$(CONFIG_ARM64_BTI_KERNEL) += -z force-bti # potential future proofing if we end up with internal calls to the exported # routines, as x86 does (see 6f121e548f83 ("x86, vdso: Reimplement vdso.so # preparation in build-time C")). -ldflags-y := -shared -soname=linux-vdso.so.1 --hash-style=sysv \ +ldflags-y := -shared -soname=linux-vdso.so.1 \ -Bsymbolic --build-id=sha1 -n $(btildflags-y) ifdef CONFIG_LD_ORPHAN_WARN diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index cc4508c604b2..25a2cb6317f3 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -98,7 +98,7 @@ VDSO_AFLAGS += -D__ASSEMBLY__ # From arm vDSO Makefile VDSO_LDFLAGS += -Bsymbolic --no-undefined -soname=linux-vdso.so.1 VDSO_LDFLAGS += -z max-page-size=4096 -z common-page-size=4096 -VDSO_LDFLAGS += -shared --hash-style=sysv --build-id=sha1 +VDSO_LDFLAGS += -shared --build-id=sha1 VDSO_LDFLAGS += --orphan-handling=$(CONFIG_LD_ORPHAN_WARN_LEVEL)