From nobody Fri Feb 11 22:32:28 2022 X-Original-To: dev-commits-src-all@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 A49BA19C4EBB; Fri, 11 Feb 2022 22:32:28 +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 4JwSzc4G2qz4bvs; Fri, 11 Feb 2022 22:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644618748; 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=QJHYF4PBUv/V8sF+ceiLOwgojDHdbeWa/IIk8+T/KQA=; b=nj63UFlQTCaql8deO5g03kcLVW120VzDu3CGlVWbqcmTz5/VRv2POBGLKSslwENDJ+MWZt FBaF6MV61LKwwlJqpRpcR294oncCce5XcDPp5upexHHAoZLvLPyvJJSrVLuQsf1VdJPZZ/ YYlrOl6I0FDjQdXn1lex3ufskbFJYlUM6miTy1J+QjNoM1HfjCjlF+4tutpvX4rqnfr8Kw pHs5EuEW3FbCUpnuN3ZeCP3MMGMWT5ZYQIvgQuHrj0yfC9jvA6ENNugDWTmvBy3x496io1 ok96mCG2cxnLMSsT622ywB+k3YgSj7G6DwQUWnaBc8IZa+RCqwlrxK141MRrag== 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 728831C3DA; Fri, 11 Feb 2022 22:32:28 +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 21BMWSff087849; Fri, 11 Feb 2022 22:32:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BMWSSs087848; Fri, 11 Feb 2022 22:32:28 GMT (envelope-from git) Date: Fri, 11 Feb 2022 22:32:28 GMT Message-Id: <202202112232.21BMWSSs087848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fd8d4e53bc2a - main - vdso linker scripts: explicitly specify output arch and target List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: fd8d4e53bc2ac424d6f08ac700800093b03a2d97 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644618748; 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=QJHYF4PBUv/V8sF+ceiLOwgojDHdbeWa/IIk8+T/KQA=; b=htc9PX5tfTyRlHIZdH9QMVhvDO7SkE20iXQ3kxA3eqArNN154W/QuM2b0awUXg1rj1Vggj VNynOxnOx9oapbpARdLpLxcn6Hwt3Cdn9FlguyeCR8L7KvUFB+gL9m7W8geFg/VggjvnP9 IZlNqZUJc0BEVShLmHMQyI4eXj7gAfsWrTE1xPQAEWqokOsW06IgaaYwr5k0WKaiTy68AX 7WmEO6qGeLbcUbO+v1fQi9uowR8XR1xnSV749NqQGc3yCIoAAlHSlFERkE0nIhY+Ob/2Xz o0q7I36VfNVm+qCyyyl+jlzOKoPwJUQ6ulyX7Y2n+d1utWax7wyQ+JlNAbrENQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644618748; a=rsa-sha256; cv=none; b=Nhzc6OlQhd17D7MPn5N+OG0cUIkbwYR+07iaCwj+cimJlrlySxgaAUUIQHTji58aUdRs65 uW/vEUnSM7hLHXGVSUvOdc90z1Px3GPgvIJXQDWiMHHMrQtoP9L5RKwLGw7PdzLlVOdIny LbsVX/P18UhKkAJWcxJ+zbI0eRF2dY/7D1Cpv5dWMRoHtGzVmF1+/+IeaDvq+TdizjEFRq mtwotCSQd0UQ1oXKWqLNPrxi0f1GUj7S7OG6sqfoonZHDGlGF+sF07YTD6Kge3ygjpBnPJ /DV/VXdeMSIaB2BUgc19kmhV3mZ3kpLW7wgofdiZFtokMivrglOjcR5SVr+FSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fd8d4e53bc2ac424d6f08ac700800093b03a2d97 commit fd8d4e53bc2ac424d6f08ac700800093b03a2d97 Author: Konstantin Belousov AuthorDate: 2022-02-03 14:38:15 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-11 22:32:23 +0000 vdso linker scripts: explicitly specify output arch and target Requested by: jhb Reviewed by: emaste, imp, jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D34157 --- 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 {