From owner-svn-src-all@freebsd.org Fri Dec 27 05:01:14 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF1E01E2FAF; Fri, 27 Dec 2019 05:01:14 +0000 (UTC) (envelope-from bdragon@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47kZRG5bf8z3Dq0; Fri, 27 Dec 2019 05:01:14 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BB54EBE16; Fri, 27 Dec 2019 05:01:14 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBR51EKk085340; Fri, 27 Dec 2019 05:01:14 GMT (envelope-from bdragon@FreeBSD.org) Received: (from bdragon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBR51EVl085337; Fri, 27 Dec 2019 05:01:14 GMT (envelope-from bdragon@FreeBSD.org) Message-Id: <201912270501.xBR51EVl085337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdragon set sender to bdragon@FreeBSD.org using -f From: Brandon Bergren Date: Fri, 27 Dec 2019 05:01:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356118 - in head/sys: conf contrib/ncsw/Peripherals/BM contrib/ncsw/Peripherals/QM X-SVN-Group: head X-SVN-Commit-Author: bdragon X-SVN-Commit-Paths: in head/sys: conf contrib/ncsw/Peripherals/BM contrib/ncsw/Peripherals/QM X-SVN-Commit-Revision: 356118 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Dec 2019 05:01:14 -0000 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; }