From owner-svn-src-projects@freebsd.org  Fri Feb 19 17:32:31 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 E1244AAD4A9
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri, 19 Feb 2016 17:32:31 +0000 (UTC)
 (envelope-from sbruno@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 B2F081937;
 Fri, 19 Feb 2016 17:32:31 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1JHWUmP073015;
 Fri, 19 Feb 2016 17:32:30 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1JHWUCv073014;
 Fri, 19 Feb 2016 17:32:30 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201602191732.u1JHWUCv073014@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Fri, 19 Feb 2016 17:32:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r295820 - projects/mips64-clang/sys/mips/mips
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.20
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: Fri, 19 Feb 2016 17:32:32 -0000

Author: sbruno
Date: Fri Feb 19 17:32:30 2016
New Revision: 295820
URL: https://svnweb.freebsd.org/changeset/base/295820

Log:
  clang IAS just doesn't handle $at the same way as binutils.  This fixes
  errors and will allow a build of GXEMUL to succeed.
  
  Similar to r295727

Modified:
  projects/mips64-clang/sys/mips/mips/mpboot.S

Modified: projects/mips64-clang/sys/mips/mips/mpboot.S
==============================================================================
--- projects/mips64-clang/sys/mips/mips/mpboot.S	Fri Feb 19 17:14:34 2016	(r295819)
+++ projects/mips64-clang/sys/mips/mips/mpboot.S	Fri Feb 19 17:32:30 2016	(r295820)
@@ -70,20 +70,26 @@ GLOBAL(mpentry)
 	/*
 	 * Initialize stack and call machine startup
 	 */
+	.set at
 	PTR_LA	sp, _C_LABEL(pcpu_space)
+	.set noat
 	addiu	sp, (PAGE_SIZE * 2) - CALLFRAME_SIZ
 	sll	t0, s0, PAGE_SHIFT + 1
 	addu	sp, sp, t0
 
 	/* Zero out old ra and old fp for debugger */
-	sw      zero, CALLFRAME_SIZ - 4(sp)
-	sw      zero, CALLFRAME_SIZ - 8(sp)
+	sw      zero, ((CALLFRAME_SIZ) - 4)(sp)
+	sw      zero, ((CALLFRAME_SIZ) - 8)(sp)
 
+	.set at
 	PTR_LA	gp, _C_LABEL(_gp)
+	.set noat
 
 	jal	platform_init_ap
 	move	a0, s0
 	jal	smp_init_secondary
 	move	a0, s0
 
+	.set at
 	PANIC("AP startup failed!")
+	.set noat