From nobody Wed Aug 23 17:01:27 2023 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 4RWCD75TTYz4r6pr; Wed, 23 Aug 2023 17:01:27 +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 4RWCD74Zgqz4N3s; Wed, 23 Aug 2023 17:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692810087; 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=gr2pp246tJUhqFJHqv7293bKhmpV5dWLwjHSxE8veHA=; b=x0ZQIDe3th0DhaHjec/D7Y23i9jhRf+xN2WIDafdTo3g8pVEIGUqn4YCQ0gDIxDnVmPVnM ThVnB+t1IjRPyyogB562uIl9uzMwLwfjqk8h75A3tu2iFbnpmhAFC6CsAcnELxHD2OOGcX OOCQEyW9HFKTosRev/0eHSP0CorJ/DFfsTu4Qka6C69Bcu2wTonarpX0T0N0zgmJ9NQSOJ qlIqhamXVC545Mll+Gu/tdxoZB7n1um3jB3YGuhRBTcv51btd45D6JWBTzc2e811TbF8gu 9Srgxvlz2EIgsGPknbkegBmjkvz8z24/UEi7pqctanBl77ULhi+afWnj3/x2/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692810087; 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=gr2pp246tJUhqFJHqv7293bKhmpV5dWLwjHSxE8veHA=; b=dNNN3+qHuwDR9J49Gl8OIYldNcv0LQBxUMa54Fy/CuewgpTQhyax3Ii5H5wBGNkutTUP3p XmRESAiMmI902j7hyQe72qmjtUkP+H2wQd28saDlsDN3+LihI34/u0cxVQ4pkBE+/hX1DX uJEmnh/GFJ7b93nT8LFFfWVRNi6RaFADgT+Mkf8Qh2mlXPfWT35csGOUNftt9mR4Zh3ktF F+7ttO30XedqdQuzUN/77YHrzOGf7IbU3Vl2j3hnMnu+KjSS4mbhFsYakR9fBEDsQF7zRP I3KMs4ZBTRWdbW2pQlGy1qdc6vgD8F3X1/yP2JXjibek2weQMum/wga6B29Vxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692810087; a=rsa-sha256; cv=none; b=Mey/QMi7r0ce47jPJTRBUqs/65yQZz8JBw6djkaSa51kbZBEuyL2+TFDZxFr3nmhj/Fgbj A2WEdYj8dAXoNQ+UHbBs4GdE+sbOgBC9aVy0xvPPS3dSMt1P9WWPvVVbqQjSebFIfm32rg nXoNS0UfFJ8W9NEwJMmaG97morRbfGw7NBv0CDs5nC7dzSRJbxXbehgdJRjR16qZpoH0bb +3yjBVKSUosdha4iDjnFBA16xoeBcxafG+54UCAp7T/uzfoUHDiVKFgMkm0X9Sru6Yb3BZ UdbSzmlEX6lLCiWdeFpgi9PR+9ierCivGrv2pKaCmzfHLSnsGLcXZ1YIJMOqSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RWCD73NGhzshR; Wed, 23 Aug 2023 17:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37NH1RYX070103; Wed, 23 Aug 2023 17:01:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NH1RTT070100; Wed, 23 Aug 2023 17:01:27 GMT (envelope-from git) Date: Wed, 23 Aug 2023 17:01:27 GMT Message-Id: <202308231701.37NH1RTT070100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ecf01a8ebc44 - main - Makefile: Support universe-toolchain on non-FreeBSD 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecf01a8ebc443d1b33c7b61a22f28145f41c25a9 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ecf01a8ebc443d1b33c7b61a22f28145f41c25a9 commit ecf01a8ebc443d1b33c7b61a22f28145f41c25a9 Author: Jessica Clarke AuthorDate: 2023-08-23 17:00:16 +0000 Commit: Jessica Clarke CommitDate: 2023-08-23 17:00:16 +0000 Makefile: Support universe-toolchain on non-FreeBSD We currently pass MACHINE and MACHINE_ARCH as TARGET and TARGET_ARCH respectively for universe-toolchain, but on non-FreeBSD these may not have values that we understand (e.g. on Linux it will be x86_64 rather than amd64) for TARGET/TARGET_ARCH (note that we do support them for MACHINE/MACHINE_ARCH). Since the choice is a bit arbitrary and merely determines what LLVM's default triple will be, use amd64 on non-FreeBSD as a known-good default. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D41545 --- Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4b8d7c850bd6..b36e27e7f294 100644 --- a/Makefile +++ b/Makefile @@ -582,6 +582,17 @@ MAKE_PARAMS_${arch}?= CROSS_TOOLCHAIN=${TOOLCHAIN_${arch}} UNIVERSE_TARGET?= buildworld KERNSRCDIR?= ${.CURDIR}/sys +.if ${.MAKE.OS} == "FreeBSD" +UNIVERSE_TOOLCHAIN_TARGET?= ${MACHINE} +UNIVERSE_TOOLCHAIN_TARGET_ARCH?= ${MACHINE_ARCH} +.else +# MACHINE/MACHINE_ARCH may not follow the same naming as us (e.g. x86_64 vs +# amd64) on non-FreeBSD. Rather than attempt to sanitise it, arbitrarily use +# amd64 as the default universe toolchain target. +UNIVERSE_TOOLCHAIN_TARGET?= amd64 +UNIVERSE_TOOLCHAIN_TARGET_ARCH?= amd64 +.endif + targets: .PHONY @echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets" .for target in ${TARGETS} @@ -613,7 +624,8 @@ universe-toolchain: .PHONY universe_prologue @echo "--------------------------------------------------------------" ${_+_}@cd ${.CURDIR}; \ env PATH=${PATH:Q} ${SUB_MAKE} ${JFLAG} kernel-toolchain \ - TARGET=${MACHINE} TARGET_ARCH=${MACHINE_ARCH} \ + TARGET=${UNIVERSE_TOOLCHAIN_TARGET} \ + TARGET_ARCH=${UNIVERSE_TOOLCHAIN_TARGET_ARCH} \ OBJTOP="${HOST_OBJTOP}" \ WITHOUT_SYSTEM_COMPILER=yes \ WITHOUT_SYSTEM_LINKER=yes \