From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 19 03:13:06 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0980F653;
 Sat, 19 Jan 2013 03:13:06 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EB29E7E0;
 Sat, 19 Jan 2013 03:13:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0J3D5V3055370;
 Sat, 19 Jan 2013 03:13:05 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0J3D52k055366;
 Sat, 19 Jan 2013 03:13:05 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201301190313.r0J3D52k055366@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sat, 19 Jan 2013 03:13:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245646 - in projects/arm_eabi/sys: arm/arm libkern/arm
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.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jan 2013 03:13:06 -0000

Author: andrew
Date: Sat Jan 19 03:13:04 2013
New Revision: 245646
URL: http://svnweb.freebsd.org/changeset/base/245646

Log:
  Fix a few mis-merges

Modified:
  projects/arm_eabi/sys/arm/arm/trap.c
  projects/arm_eabi/sys/libkern/arm/ldivmod.S
  projects/arm_eabi/sys/libkern/arm/ldivmod_helper.c

Modified: projects/arm_eabi/sys/arm/arm/trap.c
==============================================================================
--- projects/arm_eabi/sys/arm/arm/trap.c	Sat Jan 19 02:58:47 2013	(r245645)
+++ projects/arm_eabi/sys/arm/arm/trap.c	Sat Jan 19 03:13:04 2013	(r245646)
@@ -911,8 +911,6 @@ syscall(struct thread *td, trapframe_t *
 
 #ifndef __ARM_EABI__
 	sa.insn = *(uint32_t *)(frame->tf_pc - INSN_SIZE);
-#ifndef __ARM_EABI__
-	/* TODO: Also add the above line when we don't need it in the EABI case */
 	switch (sa.insn & SWI_OS_MASK) {
 	case 0: /* XXX: we need our own one. */
 		break;

Modified: projects/arm_eabi/sys/libkern/arm/ldivmod.S
==============================================================================
--- projects/arm_eabi/sys/libkern/arm/ldivmod.S	Sat Jan 19 02:58:47 2013	(r245645)
+++ projects/arm_eabi/sys/libkern/arm/ldivmod.S	Sat Jan 19 03:13:04 2013	(r245646)
@@ -28,6 +28,8 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
+#ifdef __ARM_EABI__
+
 /*
  * These calculate:
  * q = n / m 
@@ -61,3 +63,5 @@ ENTRY_NP(__aeabi_uldivmod)
 	ldmfd	sp!, {r2, r3}	/* Load the remainder */
 	RET
 
+#endif
+

Modified: projects/arm_eabi/sys/libkern/arm/ldivmod_helper.c
==============================================================================
--- projects/arm_eabi/sys/libkern/arm/ldivmod_helper.c	Sat Jan 19 02:58:47 2013	(r245645)
+++ projects/arm_eabi/sys/libkern/arm/ldivmod_helper.c	Sat Jan 19 03:13:04 2013	(r245646)
@@ -28,6 +28,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#ifdef __ARM_EABI__
 #include <libkern/quad.h>
 
 /*
@@ -48,3 +49,5 @@ __kern_ldivmod(long long n, long long m,
 	return q;
 }
 
+#endif
+