diff options
| author | andrew <andrew@FreeBSD.org> | 2015-06-01 18:15:44 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2015-06-01 18:15:44 +0000 |
| commit | 2898b805c5ccfcd47e3d09de91d4b117fdba88e5 (patch) | |
| tree | 3118722ab1614e95805f60b79a7def23bed357e9 | |
| parent | 4dd00c1d3adf4dd15bd7a2763d565e8250f6563c (diff) | |
| download | FreeBSD-src-2898b805c5ccfcd47e3d09de91d4b117fdba88e5.zip FreeBSD-src-2898b805c5ccfcd47e3d09de91d4b117fdba88e5.tar.gz | |
Remove __ARM_EABI__ from sys/arm/arm, building for oabi is unsupported.
| -rw-r--r-- | sys/arm/arm/elf_trampoline.c | 3 | ||||
| -rw-r--r-- | sys/arm/arm/exception.S | 4 | ||||
| -rw-r--r-- | sys/arm/arm/stack_machdep.c | 10 |
3 files changed, 0 insertions, 17 deletions
diff --git a/sys/arm/arm/elf_trampoline.c b/sys/arm/arm/elf_trampoline.c index 296aee1..c3a7eed 100644 --- a/sys/arm/arm/elf_trampoline.c +++ b/sys/arm/arm/elf_trampoline.c @@ -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 - diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S index 2d0ad8c..4447eb2 100644 --- a/sys/arm/arm/exception.S +++ b/sys/arm/arm/exception.S @@ -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 */ \ diff --git a/sys/arm/arm/stack_machdep.c b/sys/arm/arm/stack_machdep.c index 9c984a9..9e68023 100644 --- a/sys/arm/arm/stack_machdep.c +++ b/sys/arm/arm/stack_machdep.c @@ -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 |
