Author: bdragon
Date: Fri Dec 27 05:01:13 2019
New Revision: 356118
URL: https://svnweb.freebsd.org/changeset/base/356118
Log:
[PowerPC] Clang powerpcspe build fixes
* Fix a couple of format errors.
* Add some extra compiler flags needed to force clang to build SPE code.
(These are temporary until the target triple is fixed)
Modified:
head/sys/conf/Makefile.powerpc
head/sys/contrib/ncsw/Peripherals/BM/bm.h
head/sys/contrib/ncsw/Peripherals/QM/qm.c
Modified: head/sys/conf/Makefile.powerpc
==============================================================================
--- head/sys/conf/Makefile.powerpc Fri Dec 27 04:52:17 2019
(r356117)
+++ head/sys/conf/Makefile.powerpc Fri Dec 27 05:01:13 2019
(r356118)
@@ -37,7 +37,9 @@ INCLUDES+= -I$S/contrib/libfdt
.if "${MACHINE_ARCH}" == "powerpcspe"
# Force __SPE__, since the builtin will be removed later with -mno-spe
-CFLAGS+= -mabi=spe -D__SPE__
+CFLAGS.gcc+= -mabi=spe -D__SPE__
+CFLAGS.clang+= -mspe -D__SPE__ -m32
+HACK_EXTRA_FLAGS= -shared -m32 -mspe -D__SPE__
.endif
CFLAGS+= -msoft-float
CFLAGS.gcc+= -Wa,-many
Modified: head/sys/contrib/ncsw/Peripherals/BM/bm.h
==============================================================================
--- head/sys/contrib/ncsw/Peripherals/BM/bm.h Fri Dec 27 04:52:17 2019
(r356117)
+++ head/sys/contrib/ncsw/Peripherals/BM/bm.h Fri Dec 27 05:01:13 2019
(r356118)
@@ -395,7 +395,7 @@ static __inline__ uint32_t BmBpidGet(t_Bm *p_Bm, bool
size,
alignment,
"BM BPID MEM");
- KASSERT(ans < UINT32_MAX, ("Oops, %lx > UINT32_MAX!\n", ans));
+ KASSERT(ans < UINT32_MAX, ("Oops, %jx > UINT32_MAX!\n", (uintmax_t)ans));
return (uint32_t)ans;
}
Modified: head/sys/contrib/ncsw/Peripherals/QM/qm.c
==============================================================================
--- head/sys/contrib/ncsw/Peripherals/QM/qm.c Fri Dec 27 04:52:17 2019
(r356117)
+++ head/sys/contrib/ncsw/Peripherals/QM/qm.c Fri Dec 27 05:01:13 2019
(r356118)
@@ -560,7 +560,7 @@ uint32_t QmFqidGet(t_Qm *p_Qm, uint32_t size, uint32_t
"QM FQID MEM");
XX_UnlockIntrSpinlock(p_Qm->lock, intFlags);
- KASSERT(ans < UINT32_MAX, ("Oops, %lx > UINT32_MAX!\n", ans));
+ KASSERT(ans < UINT32_MAX, ("Oops, %jx > UINT32_MAX!\n", (uintmax_t)ans));
return (uint32_t)ans;
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
