From nobody Fri Feb 18 02:01:32 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C0C4319C470B; Fri, 18 Feb 2022 02:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K0FL43dPLz4dtL; Fri, 18 Feb 2022 02:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645149692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o6Trvo47qoJpR5BUcXfzzuuf3KMODjuHXzCN7H/JZVM=; b=OIaSRx581I7fRjLnEUij/Wn91i36XQItnL2h1K74JetlsAX3Tl1bHlDDmHe52yaNxVNvo7 rk+zK0l49rIEt+22EoU78rxa3DTpPejgrY1wNWUZpu7zmw4d2WmeAl41WrqE5CrNH0Z51d cspcXnX0a24evfkP3qTg/uHNtQ7NxhFFub8f7cOmqtuiQ+5zcF27u0RSHtn2oMEgA8WoCh ERmDaPG7KVNjv1CSuFU0CIpUuO+w0qUnTAv1reindPqbljhd0JaG40+mU9WPHGKaZ4XDdW PAEMv28qkoxAHfTcDqjvqMZ/TaIdOICFT/0xmLrhzSVDxgXsWq4oUxfgx5eltA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4371814CDA; Fri, 18 Feb 2022 02:01:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21I21W70039444; Fri, 18 Feb 2022 02:01:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21I21Wgr039443; Fri, 18 Feb 2022 02:01:32 GMT (envelope-from git) Date: Fri, 18 Feb 2022 02:01:32 GMT Message-Id: <202202180201.21I21Wgr039443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1e261cb8c6df - stable/13 - vdso linker scripts: explicitly specify output arch and target List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1e261cb8c6dfd8a7c0e5193fd0f43ca732f639d4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645149692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o6Trvo47qoJpR5BUcXfzzuuf3KMODjuHXzCN7H/JZVM=; b=duAUqRtqZ6i1vIUO4WOYUAdle8PyiD7GMzleQBiffq4fmHOPTfGfnQVBZH9eDrY2lzgY6D /Abfot7+JmPzr88zPNih/JyjSKiOtJBHjjiL+D+DdNKtWW4GYsuZ6oEMzYOpmV5maYnqsg t6APevL6r6kfuWQyuvbndh9e8IKYJSyMWUPC8rksxaq9BPetypjxPMkUNuvWhPKadS4t/O 6XjHkkIqt9l4QJ1dg52HytZmKYflUVjikk8md4GVDrTu3sS9KuIC59XRZtLUz44UagdN1C myt9OG+ZhKJCqvvZQF/JLr8D3ctqv3EUg1EDgAXm8bTgMqQ3ulER7jV0ikdD2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645149692; a=rsa-sha256; cv=none; b=TDXxG0aMOc81UCYkTlicubA/S0i0caVTmjEcYihLfIAsiSdCeVZ5KGXB9FZEZ/4tr1+fGL 1A6Rc09OK6NYsj2w/dFQHOaF8iftpf4l/PGcrUXPG69JEefuItjShePaYviL+PSjYbDGlt hoZqfzb1c4p+iEjG5NxtkKh6nPaNtj0L3GL+P5iOY5NV/wqwkP9GpFUL4z9nApjgnTTIhz tZ+gXIHc7J9tGGJu6ZAiDUBnwovSc4zgaFkNOjgFyMiDHDh2BEzqKs066UTQzPoDQ2RuVf ONUH+mWeDcg+xabhIpSH9JU3pJCEyDg88ISa+s67W2Qd7aGh57G5D++sccI/DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1e261cb8c6dfd8a7c0e5193fd0f43ca732f639d4 commit 1e261cb8c6dfd8a7c0e5193fd0f43ca732f639d4 Author: Konstantin Belousov AuthorDate: 2022-02-03 14:38:15 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-18 02:01:24 +0000 vdso linker scripts: explicitly specify output arch and target (cherry picked from commit fd8d4e53bc2ac424d6f08ac700800093b03a2d97) --- sys/conf/vdso_amd64.ldscript | 8 ++++++++ sys/conf/vdso_amd64_ia32.ldscript | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/sys/conf/vdso_amd64.ldscript b/sys/conf/vdso_amd64.ldscript index d412abd4cd02..40b147e3a715 100644 --- a/sys/conf/vdso_amd64.ldscript +++ b/sys/conf/vdso_amd64.ldscript @@ -32,6 +32,14 @@ * Linker script for amd64 vdso. */ +/* + * The OUTPUT_ARCH and TARGET lines are for ld.bfd. + * lld doesn't do much with them, the only thing it does is producing ELF + * or binary based on TARGET. + */ +OUTPUT_ARCH(i386:x86-64) +TARGET(elf64-x86-64-freebsd) + PHDRS { text PT_LOAD FILEHDR PHDRS FLAGS(5); /* PF_R|PF_X */ diff --git a/sys/conf/vdso_amd64_ia32.ldscript b/sys/conf/vdso_amd64_ia32.ldscript index 2033ebb9a396..543cfad4ef73 100644 --- a/sys/conf/vdso_amd64_ia32.ldscript +++ b/sys/conf/vdso_amd64_ia32.ldscript @@ -32,7 +32,14 @@ * Linker script for ia32 (32bit) vdso on amd64. */ +/* + * The OUTPUT_ARCH and TARGET lines are for ld.bfd, which cannot determine + * the output format based on the first input file. + * lld doesn't do much with them, the only thing it does is produce ELF + * or binary based on TARGET. + */ OUTPUT_ARCH(i386) +TARGET(elf32-i386-freebsd) PHDRS {