From nobody Sat Aug 13 17:57:15 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 4M4pCb3bVbz4Y1T7; Sat, 13 Aug 2022 17:57:15 +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 4M4pCb37KFz3d4c; Sat, 13 Aug 2022 17:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660413435; 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=gX9o5SeJOfXzfPPDFZtrlcqS6olXxcZo3sBgD2vf4dQ=; b=X1hOVENamKfWHLVUdyU6sy//9woYOsfdOXxv7cZ1YLnTBSa81G0hTx3QgECAiuAu8VjBuH z16Lq2BUg0BSuR0UU9RSZPs8A/7QifI3lFThI86PitQ6apwPa8snYkVKP+OyLTqsacgP8S JnoRAOEKv71sQ5BQgBKZYqAUbhxN4QGH4l+C3nuSiAFEg3JIrmWPbhjtvsPOaWW2d4giQd b9vTYqxx08U5V4tCMf1FBnoUOkFyarumFQEKbSWxKthq1PhI/YnV03J15mS3DEXcXR/9Nz WhlIoPMbr8E832vvGs9vzLdoiKTFFEVeKPdy0e2QyCsJ1suY4Rx7kAsrTEJAbA== 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 4M4pCb1zgszKjd; Sat, 13 Aug 2022 17:57:15 +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 27DHvFIs088124; Sat, 13 Aug 2022 17:57:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27DHvF7D088123; Sat, 13 Aug 2022 17:57:15 GMT (envelope-from git) Date: Sat, 13 Aug 2022 17:57:15 GMT Message-Id: <202208131757.27DHvF7D088123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4e2a0135a0fd - main - mrsas module: Use MACHINE_ARCH exlcusively 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e2a0135a0fd3dc59d8e7f48ccc1abf0e548bae7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660413435; 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=gX9o5SeJOfXzfPPDFZtrlcqS6olXxcZo3sBgD2vf4dQ=; b=hk0SbfJ6QIN4HfG6po6y2As2gS/2rQXCYfjsdBaJ4ADm3ni+VxL8NJhWgx5ZuNlQsDaeZB Fh4t13WbY8wOh/L0NeMhbxt9gU1O5QcQ3NUOT8g6rCThEP9ArFTqkUONVMfqvyU0I5lloT PDft0E/zJyZD2Opz2PTGzicE2CbYsRq1ZsZHGG2s99OZ8cR763FbVdWcyEbf/pgG6GW0yL gB7iMqr+gy/9UX8N1vG2UnuE8Az1/h9DhwNV464dFHr8cvdcRAZbBvILu7vXqxMH4eYgDP ZnopBehCN5uXYCiyqfABf1kAxTSH7gPah+wDq5M8n57In4USVEsoXVMLCw+YYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660413435; a=rsa-sha256; cv=none; b=uGmlE4yTLL5COZEqeq0i7SXRBhrCmwGVZcIMhqcdN3H37lhm0LS8+vnODbdh+qZbgCOPhn 7tJTYj+I2Lh3TDe0Qsuy1kxUWVB5rpL06EX4Uds8blfJJvd6Ie/ZN/Xv6DvcMEbVwb7lwl RLwnAEE/MAhX+TmoSAfFvW+I+f+ghS/DyT7vHk+zqkERSk1MP8tYmYUVOkD4OuLs1vLeUU 4+17w2kMIasWLJDxvnwngr/vmgMimvWOQUzGE1+RMxsTLrS+ac5o4Y2aXO357aPgFV5UX8 1lyg0EklLeomUAUmBSlKb/r7ufKTbcAKFx4Xo3FMkgbLx4GstVGlGlLSZA3mNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4e2a0135a0fd3dc59d8e7f48ccc1abf0e548bae7 commit 4e2a0135a0fd3dc59d8e7f48ccc1abf0e548bae7 Author: Warner Losh AuthorDate: 2022-08-13 17:53:22 +0000 Commit: Warner Losh CommitDate: 2022-08-13 17:56:53 +0000 mrsas module: Use MACHINE_ARCH exlcusively TARGET_ARCH is always wrong when not used at the toplevel Makefile*, or in something that has to be included from there. Switch to using MACHINE_ARCH exclusively here since there's no benefit from assigning TARGET_ARCH the value of MACHINE_ARCH and then using TARGET_ARCH (and make TARGET_ARCH=xxx won't work). Sponsored by: Netflix --- sys/modules/mrsas/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/modules/mrsas/Makefile b/sys/modules/mrsas/Makefile index c3c7580805fe..130a46a8ad5f 100644 --- a/sys/modules/mrsas/Makefile +++ b/sys/modules/mrsas/Makefile @@ -15,8 +15,7 @@ SRCS+= device_if.h bus_if.h pci_if.h opt_cam.h opt_scsi.h .include CFLAGS+= -fgnu89-inline -TARGET_ARCH = ${MACHINE_ARCH} -.if ${TARGET_ARCH} == "amd64" +.if ${MACHINE_ARCH} == "amd64" CFLAGS+= -DCOMPAT_FREEBSD32 .endif