From nobody Tue Jul 04 15:39:01 2023 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 4QwRm53h88z4m9lT; Tue, 4 Jul 2023 15:39:01 +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 4QwRm53HzJz45FY; Tue, 4 Jul 2023 15:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688485141; 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=LzczIkX03a9e/CBlypL7SKfJBHSIepuUeOz4YTuHN48=; b=svLDui4ajduCqOXxgVk8I2EymKud3/Rqe7mpB+HV/riDGYNmqPo5o+bzP1ZnaLH+JaY92X r6VfkEOFPv2MXh8QR6XxRCbZMSWe2LIK6iYMsn1Hd2Z/9TEl2gxuCJ2EPlABqSC3JRWsEh u8J2B4C+F4veMbc6DWUDnFiz/PYlOFzZK1QGyhNMzUzjcw3d15qjtB8iRtwTQbY28cwdx9 IjQeD18Gn+yQs5RQoY6TNyEfr4mmoxafvGu44rW7OclcoSUze7efhTXlOm6cZIiXQn6MaP Mqf9Gs9pczrfUYlsO6rfkALlaEGBs8Gx8pIIX2BfNe7WTSfrfqrqXgwWEjZpmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688485141; 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=LzczIkX03a9e/CBlypL7SKfJBHSIepuUeOz4YTuHN48=; b=P40lvXRx5txOidzCN9qBn/Ueb3p0CbqBrXcoh3D+mf+vkZfb00VlDDLo3pwmWh/p+SdZsx POusY0AI1kQ9dL2NrT/YomWoAz0usPHNsxrPG4NHCQLT/jKM3WUHbVs+rZtc4YT8m2O5o7 +7fSCPZM/JWctsQuLiEFhsnTFFDebnia4R71wAiGWhHPlmJ/5Zb9VE7f99tiP4dk2CfdrA ZpqcegfG4nv9gu1mpirVh4McOyrLx4MMfRxJZn7CCKLaSA8r2A14CqlDgsyuxHYS/tGcAl Zy7g93GqcjWFM2ta7ctB8iy7ukkoAj+B9A5V6u5WHzuM7OqEea+cIH5BdLASQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688485141; a=rsa-sha256; cv=none; b=J+BFufkZdEqz4GVKdfpQOtyQekLt2f6vjJa2HL/H0Qhr8Q5E2bl09j8J4ArYAMjkhVtFyM ACdXzdmTP0yd0IzieLNZms/GjO3ebObaitHsySowIObyplkbzGT4hEhkbuqvJMLh80jiPn 0pDUlu/mDTYFP8LFNgfc/ApQEtTj6/seHuwIOe7ITuE1zMalZE5LBD3eTXXpBXDEL09kbE EGPgGxiWSDlKKBHSpsXtvE4RZrmDuy5ao4Kw/V1Pnt1WMzqKCFvkwBCtEtVUsWx5qyxI66 PF9WWjevoMhp97teZkqe/M9cxX0MvNgK6uBN6/bn/vE8ezCHWM0sxaIB/zr0uQ== 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 4QwRm52NtQzdkn; Tue, 4 Jul 2023 15:39:01 +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 364Fd1dq032656; Tue, 4 Jul 2023 15:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 364Fd1UT032655; Tue, 4 Jul 2023 15:39:01 GMT (envelope-from git) Date: Tue, 4 Jul 2023 15:39:01 GMT Message-Id: <202307041539.364Fd1UT032655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2e28f8cc3929 - main - kinst: accommodate other architectures in Makefile 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e28f8cc39299223fe398b81676f06c419b804bc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2e28f8cc39299223fe398b81676f06c419b804bc commit 2e28f8cc39299223fe398b81676f06c419b804bc Author: Christos Margiolis AuthorDate: 2023-07-04 15:37:44 +0000 Commit: Christos Margiolis CommitDate: 2023-07-04 15:37:44 +0000 kinst: accommodate other architectures in Makefile Reviewed by: markj Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40871 --- sys/modules/dtrace/kinst/Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/modules/dtrace/kinst/Makefile b/sys/modules/dtrace/kinst/Makefile index 76304a430cd6..1cbfe5e72ff1 100644 --- a/sys/modules/dtrace/kinst/Makefile +++ b/sys/modules/dtrace/kinst/Makefile @@ -1,16 +1,23 @@ SYSDIR?= ${SRCTOP}/sys -.PATH: ${SYSDIR}/cddl/dev/kinst \ - ${SYSDIR}/cddl/dev/kinst/${MACHINE_CPUARCH} - KMOD= kinst SRCS= kinst.c kinst_isa.c trampoline.c CFLAGS+= ${OPENZFS_CFLAGS} \ -I${SYSDIR}/cddl/dev/kinst \ - -I${SYSDIR}/cddl/dev/dtrace/x86 \ -I${SYSDIR}/cddl/dev/kinst/${MACHINE_CPUARCH} +.PATH: ${SYSDIR}/cddl/dev/kinst \ + ${SYSDIR}/cddl/dev/kinst/${MACHINE_CPUARCH} + +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +CFLAGS+= -I${SYSDIR}/cddl/dev/dtrace/x86 +.PATH: ${SYSDIR}/cddl/dev/dtrace/x86 +.else +CFLAGS+= -I${SYSDIR}/cddl/dev/dtrace/${MACHINE_CPUARCH} +.PATH: ${SYSDIR}/cddl/dev/dtrace/${MACHINE_CPUARCH} +.endif + .include CFLAGS+= -include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h