From nobody Fri Jun 16 19:15:14 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 4QjTPt4rCMz4fZlw; Fri, 16 Jun 2023 19:15:14 +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 4QjTPt4Pwmz3xq1; Fri, 16 Jun 2023 19:15:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686942914; 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=PZ7dPMdj57D+hNUZJclKsENVVn5PKcKN81lZeAU0sJg=; b=BnnzdVYzTd6IcKTFPqtCce21nUDF38ezagNDwG+7ZsC/d+plHV6SNn7x5O28y7m4dpJlOF AiX+OmytTqRD2UpuaxYbSo9aP3Jl5sPFcWRqjuJMDZfiUMhaixPmgtE+XSstRzsd1Uf+yh 9NHucsPcL3WIV3dCUhMNHnn01PrBrGJjb6yj+Y3nNOQPrOxRkF4ZDzGpldXWB+uKjnPptx DPnpHrIYhZVN0lPCjuSEdnpBqxO2Rhwq17wtc/BE1U6tPu49gJN+bGzOqYWvStsdVBuPvG mbzs5Co/VURHcaWvPLOfbW8un1NlijMjt3ccoy0Af36d4UDedjYMno2SLN/M+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686942914; 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=PZ7dPMdj57D+hNUZJclKsENVVn5PKcKN81lZeAU0sJg=; b=CQ4Q0D+LZiocAg+7084fEXck+/l86SZ4cSqnYDbQ+TH9MQrPUfcUrVMWunjFiVsyubNcvX RaBrr8aID9ed0Y7hK2fBtEgVyuG2H8jTBd3q9DMEJoJiC5EPuWpCPw7e+3JwH6ell+l/uC 3W5eZ2yKPe9WbZeJ3Va7AFxGOM1LDeC2UI6kLxjaQGnpLktWogfU13+XoMQQjl6sdGQ79q kWHF/kAYJpE7wbgxEIQcQjQ4/+GHqdRGkUNl45Bg9+r8unlqJ7oDW+pOgIHKOn54PTvvRo 0mLwUBsgqWqXW/kpR9rGfYUwtLphCdDGVOTUG5zGue6+VgLXNlhcGDIleuL7uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686942914; a=rsa-sha256; cv=none; b=fEky+ZDG+muThYcHF7waaPZ5axCS+MazdgOcXHymdtWZYIr41SzhfksB9PTQLcogOnhdt0 +O3GmjVdVAtboQvYBciuhCKBdd6LDmwLALKI9ldKAyMRYe8RBwT2E4iqvHj7IDkYGS66BB AMFFZFrecnORwHtD0oAJTt2auy5ueQs5/20e1Au0O0/ayQPJBBYM3HddLEpyfLuhlArxSA K9FKaT4Ybgu4vaDoJwesEADuz6qUc0OqGw4me1HRxnJx8AWKOKqYNlhNHI7z3jnfOuRb6+ u2Lq2+ab4X+01pCSvVes4bN6+52P0c2TFUmC2QLkwRQFAkx98GSnLWb9l+jAJw== 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 4QjTPt3VfczgKP; Fri, 16 Jun 2023 19:15:14 +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 35GJFEaj022767; Fri, 16 Jun 2023 19:15:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35GJFEoQ022766; Fri, 16 Jun 2023 19:15:14 GMT (envelope-from git) Date: Fri, 16 Jun 2023 19:15:14 GMT Message-Id: <202306161915.35GJFEoQ022766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 2c7279bae776 - main - share/mk/bsd.cpu.mk: handle the default case when CPUTYPE is not specified on powerpc* 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: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c7279bae7767e9b10a73f44817adb168b69b522 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=2c7279bae7767e9b10a73f44817adb168b69b522 commit 2c7279bae7767e9b10a73f44817adb168b69b522 Author: Piotr Kubaj AuthorDate: 2023-06-16 09:43:42 +0000 Commit: Piotr Kubaj CommitDate: 2023-06-16 19:15:03 +0000 share/mk/bsd.cpu.mk: handle the default case when CPUTYPE is not specified on powerpc* Approved by: imp Differential Revision: https://reviews.freebsd.org/D40576 --- share/mk/bsd.cpu.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index ba18204b9230..e47ee30d2ce6 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -14,8 +14,12 @@ MACHINE_CPU = amd64 sse2 sse mmx MACHINE_CPU = arm . elif ${MACHINE_CPUARCH} == "i386" MACHINE_CPU = i486 -. elif ${MACHINE_CPUARCH} == "powerpc" +. elif ${MACHINE_ARCH} == "powerpc" MACHINE_CPU = aim +. elif ${MACHINE_ARCH} == "powerpc64" +MACHINE_CPU = aim altivec +. elif ${MACHINE_ARCH} == "powerpc64le" +MACHINE_CPU = aim altivec vsx vsx2 . elif ${MACHINE_CPUARCH} == "riscv" MACHINE_CPU = riscv . endif @@ -277,7 +281,9 @@ MACHINE_CPU += amd64 sse2 sse mmx . if ${CPUTYPE} == "e500" MACHINE_CPU = booke softfp . elif ${CPUTYPE} == "g4" -MACHINE_CPU = altivec +MACHINE_CPU = aim altivec +. else +MACHINE_CPU= aim . endif . elif ${MACHINE_ARCH} == "powerpc64" . if ${CPUTYPE} == "e5500" @@ -289,10 +295,10 @@ MACHINE_CPU = altivec vsx vsx2 . elif ${CPUTYPE} == power9 MACHINE_CPU = altivec vsx vsx2 vsx3 . else -MACHINE_CPU = altivec +MACHINE_CPU = aim altivec . endif . elif ${MACHINE_ARCH} == "powerpc64le" -MACHINE_CPU = altivec vsx vsx2 +MACHINE_CPU = aim altivec vsx vsx2 . if ${CPUTYPE} == power9 MACHINE_CPU += vsx3 . endif