Author: andrew
Date: Mon Jun 1 18:15:44 2015
New Revision: 283888
URL: https://svnweb.freebsd.org/changeset/base/283888
Log:
Remove __ARM_EABI__ from sys/arm/arm, building for oabi is unsupported.
Modified:
head/sys/arm/arm/elf_trampoline.c
head/sys/arm/arm/exception.S
head/sys/arm/arm/stack_machdep.c
Modified: head/sys/arm/arm/elf_trampoline.c
==============================================================================
--- head/sys/arm/arm/elf_trampoline.c Mon Jun 1 18:13:32 2015
(r283887)
+++ head/sys/arm/arm/elf_trampoline.c Mon Jun 1 18:15:44 2015
(r283888)
@@ -725,7 +725,6 @@ __start(void)
(unsigned int)(&load_kernel) + 800, sp);
}
-#ifdef __ARM_EABI__
/* We need to provide these functions but never call them */
void __aeabi_unwind_cpp_pr0(void);
void __aeabi_unwind_cpp_pr1(void);
@@ -737,5 +736,3 @@ void
__aeabi_unwind_cpp_pr0(void)
{
}
-#endif
-
Modified: head/sys/arm/arm/exception.S
==============================================================================
--- head/sys/arm/arm/exception.S Mon Jun 1 18:13:32 2015
(r283887)
+++ head/sys/arm/arm/exception.S Mon Jun 1 18:15:44 2015
(r283888)
@@ -237,7 +237,6 @@ _C_LABEL(dtrace_invop_calltrap_addr):
ldmia sp, {sp, lr, pc}^ /* Restore lr and exit */
#endif
-#if defined(__ARM_EABI__)
/*
* Unwind hints so we can unwind past functions that use
* PULLFRAMEFROMSVCANDEXIT. They are run in reverse order.
@@ -249,9 +248,6 @@ _C_LABEL(dtrace_invop_calltrap_addr):
.pad #(2*4); /* Skip user sp and lr */ \
.save {r0-r12}; /* Restore r0-r12 */ \
.pad #(4) /* Skip spsr */
-#else
-#define UNWINDSVCFRAME
-#endif
#define DO_AST
\
ldr r0, [sp]; /* Get the SPSR from stack */ \
Modified: head/sys/arm/arm/stack_machdep.c
==============================================================================
--- head/sys/arm/arm/stack_machdep.c Mon Jun 1 18:13:32 2015
(r283887)
+++ head/sys/arm/arm/stack_machdep.c Mon Jun 1 18:15:44 2015
(r283888)
@@ -49,16 +49,6 @@ extern vm_offset_t kernel_vm_end;
static void
stack_capture(struct stack *st, u_int32_t *frame)
{
-#if !defined(__ARM_EABI__) && !defined(__clang__)
- vm_offset_t callpc;
-
- while (INKERNEL(frame) && (vm_offset_t)frame < kernel_vm_end) {
- callpc = frame[FR_SCP];
- if (stack_put(st, callpc) == -1)
- break;
- frame = (u_int32_t *)(frame[FR_RFP]);
- }
-#endif
}
void
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
