From nobody Mon Jun 13 17:35:57 2022 X-Original-To: dev-commits-src-main@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 61022834AC3; Mon, 13 Jun 2022 17:35:58 +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 4LMJd95ngbz4tGb; Mon, 13 Jun 2022 17:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141757; 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=ASe4LBIAKXfSarstqN9f/fHgPxgDAOGHrR6FR94pbsg=; b=TUAbNQa31kjB45j3hN3H7UX2MeQR/QJskoKu1AuJZp+xyS0TMGjh7VLCwPagAsRTFqaGa3 z/3kwCFM0sgJ+QD1PVJZHgFXkGkbvMV7bVhomgNSuxV3OanwBe+RsOqaV9q4bqW5iqUWGY V+6K+9HI2kGBnn7me+ckrv8K1kZYKKT8I8lD8kmt7lR5TMeYl/X7W0M034kInUpRp1IfhG DZ2iC7h/JmcLBXQhTVhfd5bSAiHrhq0xt4RX28Ef8SY1PwNSS3Nbeen3QzkRCx7+9JJTiF TG4HQ/BjtpR75WU1EKDXzjwOfQNc9qOGR8VHmh4SzVtQjh8VqSY+s9U0FT9uJQ== 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 A48271A38E; Mon, 13 Jun 2022 17:35:57 +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 25DHZvvS061171; Mon, 13 Jun 2022 17:35:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHZvDG061170; Mon, 13 Jun 2022 17:35:57 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:35:57 GMT Message-Id: <202206131735.25DHZvDG061170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d07600c56303 - main - amd64: symlink i386 includes into build dir List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d07600c563039f252becc29ac7d9a454b6b0600d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141757; 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=ASe4LBIAKXfSarstqN9f/fHgPxgDAOGHrR6FR94pbsg=; b=ZesNHOyoYO6HqV6W/bc/eENEtFF1VaZWdFc6e7Yp7z7D1EH7hWdCVI4DB26Q9LZH0Zv3HJ 6+rZ3aLqWPT2zwC8NmGdYKZ7gIY1p1x/bYAM0of6PJD/J+mhdg3laAwEwfv42+6mWrdRao TWje8WBCQWWp4BBCpIUwUWiZbepFmha7baA17vRjN7nRFJ8Gb13wmFdG+L1szBx1iljMRm ekcB2o9bTeKbyi/ZKgmBTbwrB6Xu5Vug+KtMp0AMLAOv7WlZ7l3qqCr7SiGA086R4/tF/6 s3Bxaau5QatT/6NdKeRW94oJ/G4o/YdMJKjyd8b+nDZrEENVBdNa8/1+vxMy+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141757; a=rsa-sha256; cv=none; b=n07Xjo2Hhr/Fz/m11fC5bkfWuvn1lGrTU9d8LSKguCcodJOS/eE3z9njogSb+FrqqRuH6M vY5XczIcrqcxyFUWHLCOAPGplonFquuUE9L5FFHttOV4xYIO98LRvNuXSRtxegDLn4YZ0f aEXLoAW0i2jkrreAoS+FCxfFRhDgHhLz11Mrx2yPoE1Cdf88lKhTkE29PZFYr/C9E5pUM/ CrDU6Llk49fSjYYEdYfgFOVCEfUDW7g5tiQqS1DiHydG/GLLwALPZmevPhnpHlMrNP1lrO i6FKkpZGoC6AfqGoekDzYdm61lgEbaOOe0awuTQUd4K8FSTWA+5odSGaX+sUKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d07600c563039f252becc29ac7d9a454b6b0600d commit d07600c563039f252becc29ac7d9a454b6b0600d Author: Brooks Davis AuthorDate: 2022-06-13 17:35:38 +0000 Commit: Brooks Davis CommitDate: 2022-06-13 17:35:38 +0000 amd64: symlink i386 includes into build dir By creating an i386 symlink, this allows code compiled with -m32 to build (32-bit vdso and linux bits) when -m32 support requires files in the i386 hierarchy. Reviewed by: jhb, imp --- sys/conf/kern.post.mk | 3 +++ sys/conf/kmod.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 4fcae712e974..d08dfe30d7de 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -360,6 +360,9 @@ _ILINKS+= ${MACHINE_CPUARCH} .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _ILINKS+= x86 .endif +.if ${MACHINE_CPUARCH} == "amd64" +_ILINKS+= i386 +.endif # Ensure that the link exists without depending on it when it exists. # Ensure that debug info references the path in the source tree. diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 63041480eca9..b67c84faea07 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -283,6 +283,9 @@ _ILINKS=machine .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _ILINKS+=x86 .endif +.if ${MACHINE_CPUARCH} == "amd64" +_ILINKS+=i386 +.endif CLEANFILES+=${_ILINKS} all: ${PROG}