svn commit: r354601 - head/share/mk

[Justin Hibbits]

Author: jhibbits
Date: Sun Nov 10 22:08:07 2019
New Revision: 354601
URL: https://svnweb.freebsd.org/changeset/base/354601

Log:
  Consolidate powerpcspe CFLAGS
  
  Don't depend on CPUTYPE to define powerpcspe CFLAGS, they should be set
  unconditionally.  This reduces duplication.  Also, set some CFLAGS as
  gcc-only, because clang's SPE support always uses the SPE ABI, it's not an
  optional feature.

Modified:
  head/share/mk/bsd.cpu.mk

Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk	Sun Nov 10 20:36:38 2019	(r354600)
+++ head/share/mk/bsd.cpu.mk	Sun Nov 10 22:08:07 2019	(r354601)
@@ -136,8 +136,6 @@ _CPUCFLAGS = -Wa,-me500 -msoft-float
 .  else
 _CPUCFLAGS = -mcpu=${CPUTYPE} -mno-powerpc64
 .  endif
-. elif ${MACHINE_ARCH} == "powerpcspe"
-_CPUCFLAGS = -Wa,-me500 -mspe -mabi=spe -mfloat-gprs=double -mcpu=8548
 . elif ${MACHINE_ARCH} == "powerpc64"
 _CPUCFLAGS = -mcpu=${CPUTYPE}
 . elif ${MACHINE_CPUARCH} == "mips"
@@ -367,7 +365,8 @@ LDFLAGS+= -Wl,--secure-plt
 .endif
 
 .if ${MACHINE_ARCH} == "powerpcspe"
-CFLAGS += -mcpu=8548 -Wa,-me500 -mspe -mabi=spe -mfloat-gprs=double
+CFLAGS += -mcpu=8548 -mspe
+CFLAGS.gcc+= -mabi=spe -mfloat-gprs=double -Wa,-me500
 .endif
 
 .if ${MACHINE_CPUARCH} == "riscv"