svn commit: r245646 - in projects/arm_eabi/sys: arm/arm libkern/arm

[Andrew Turner]

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
+