From owner-svn-src-projects@freebsd.org  Sun Mar 13 22:32:04 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A631ACF99F
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 13 Mar 2016 22:32:04 +0000 (UTC)
 (envelope-from jhibbits@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 mx1.freebsd.org (Postfix) with ESMTPS id 6B7E9956;
 Sun, 13 Mar 2016 22:32:04 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2DMW3GP088144;
 Sun, 13 Mar 2016 22:32:03 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2DMW3js088142;
 Sun, 13 Mar 2016 22:32:03 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201603132232.u2DMW3js088142@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Sun, 13 Mar 2016 22:32:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r296812 - in projects/powerpcspe/sys: conf powerpc/include
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Mar 2016 22:32:04 -0000

Author: jhibbits
Date: Sun Mar 13 22:32:03 2016
New Revision: 296812
URL: https://svnweb.freebsd.org/changeset/base/296812

Log:
  Pass __SPE__ on the command line, to enforce SPE availability.
  
  -mno-spe, specified later, overrides -mspe, and undefines the implicit __SPE__.
  To maintain consistency between user and kernel, specify it manually.

Modified:
  projects/powerpcspe/sys/conf/Makefile.powerpc
  projects/powerpcspe/sys/powerpc/include/param.h

Modified: projects/powerpcspe/sys/conf/Makefile.powerpc
==============================================================================
--- projects/powerpcspe/sys/conf/Makefile.powerpc	Sun Mar 13 21:26:18 2016	(r296811)
+++ projects/powerpcspe/sys/conf/Makefile.powerpc	Sun Mar 13 22:32:03 2016	(r296812)
@@ -35,6 +35,10 @@ LDSCRIPT_NAME?= ldscript.${MACHINE_ARCH}
 
 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__
+.endif
 CFLAGS+= -msoft-float -Wa,-many
 
 # Build position-independent kernel

Modified: projects/powerpcspe/sys/powerpc/include/param.h
==============================================================================
--- projects/powerpcspe/sys/powerpc/include/param.h	Sun Mar 13 21:26:18 2016	(r296811)
+++ projects/powerpcspe/sys/powerpc/include/param.h	Sun Mar 13 22:32:03 2016	(r296812)
@@ -57,9 +57,13 @@
 #ifdef __powerpc64__
 #define	MACHINE_ARCH	"powerpc64"
 #else
+#ifdef	__SPE__
+#define	MACHINE_ARCH	"powerpcspe"
+#else
 #define	MACHINE_ARCH	"powerpc"
 #endif
 #endif
+#endif
 #define	MID_MACHINE	MID_POWERPC
 #ifdef __powerpc64__
 #ifndef	MACHINE_ARCH32