Skip to content

Commit 293131d

Browse files
authored
Merge pull request #4370 from barracuda156/unbreak_powerpc
macOS PowerPC: fix CMake build
2 parents 302ca7e + 981e315 commit 293131d

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

cmake/cc.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,18 @@ if (${CORE} STREQUAL PPC970)
286286
if (NOT DYNAMIC_ARCH)
287287
set (CCOMMON_OPT "${CCOMMON_OPT} -mcpu=970 -mtune=970 -maltivec -fno-fast-math")
288288
endif ()
289+
if (APPLE)
290+
set (CCOMMON_OPT "${CCOMMON_OPT} -force_cpusubtype_ALL")
291+
endif ()
289292
endif ()
290293

291294
if (${CORE} STREQUAL PPCG4)
292295
if (NOT DYNAMIC_ARCH)
293296
set (CCOMMON_OPT "${CCOMMON_OPT} -mcpu=G4 -mtune=G4 -maltivec -fno-fast-math")
294297
endif ()
298+
if (APPLE)
299+
set (CCOMMON_OPT "${CCOMMON_OPT} -force_cpusubtype_ALL")
300+
endif ()
295301
endif ()
296302

297303
if (NOT DYNAMIC_ARCH)

kernel/power/KERNEL.PPC970

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
ifeq ($(__BYTE_ORDER__),__ORDER_BIG_ENDIAN__)
22
SGEMMKERNEL = gemm_kernel.S
3-
SGEMMINCOPY =
4-
SGEMMITCOPY =
3+
SGEMMINCOPY =
4+
SGEMMITCOPY =
55
SGEMMONCOPY = ../generic/gemm_ncopy_4.c
66
SGEMMOTCOPY = ../generic/gemm_tcopy_4.c
7-
SGEMMINCOPYOBJ =
8-
SGEMMITCOPYOBJ =
7+
SGEMMINCOPYOBJ =
8+
SGEMMITCOPYOBJ =
99
SGEMMONCOPYOBJ = sgemm_oncopy$(TSUFFIX).$(SUFFIX)
1010
SGEMMOTCOPYOBJ = sgemm_otcopy$(TSUFFIX).$(SUFFIX)
1111
else

kernel/power/KERNEL.PPCG4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ CGEMMINCOPY =
9696
CGEMMONCOPY =
9797
CGEMMONCOPY = ../generic/zgemm_ncopy_2.c
9898
CGEMMOTCOPY = ../generic/zgemm_tcopy_2.c
99-
CGEMMINCOPYOBJ =
99+
CGEMMINCOPYOBJ =
100100
#cgemm_incopy$(TSUFFIX).$(SUFFIX)
101-
CGEMMITCOPYOBJ =
101+
CGEMMITCOPYOBJ =
102102
#cgemm_itcopy$(TSUFFIX).$(SUFFIX)
103103
CGEMMONCOPYOBJ = cgemm_oncopy$(TSUFFIX).$(SUFFIX)
104104
CGEMMOTCOPYOBJ = cgemm_otcopy$(TSUFFIX).$(SUFFIX)

0 commit comments

Comments
 (0)