Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Jun 2023 19:15:14 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 2c7279bae776 - main - share/mk/bsd.cpu.mk: handle the default case when CPUTYPE is not specified on powerpc*
Message-ID:  <202306161915.35GJFEoQ022766@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/src/commit/?id=2c7279bae7767e9b10a73f44817adb168b69b522

commit 2c7279bae7767e9b10a73f44817adb168b69b522
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-06-16 09:43:42 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306161915.35GJFEoQ022766>