At this point, the Linux code for "lib1funcs" has changed rather dramatically. While a resync would be beneficial, it's outside the scope of what we need here. Simply remove the define for CONFIG_AEABI and tests for it.
Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/lib/lib1funcs.S | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S index 7ff4446dd644..de15d09e3605 100644 --- a/arch/arm/lib/lib1funcs.S +++ b/arch/arm/lib/lib1funcs.S @@ -15,12 +15,11 @@
/* * U-Boot compatibility bit, define empty UNWIND() macro as, since we - * do not support stack unwinding and define CONFIG_AEABI to make all - * of the functions available without diverging from Linux code. + * do not support stack unwinding to make all of the functions available + * without diverging from Linux code. */ #ifdef __UBOOT__ #define UNWIND(x...) -#define CONFIG_AEABI #endif
.macro ARM_DIV_BODY dividend, divisor, result, curbit @@ -314,8 +313,6 @@ UNWIND(.fnend) ENDPROC(__modsi3) .popsection
-#ifdef CONFIG_AEABI - .pushsection .text.__aeabi_uidivmod, "ax" ENTRY(__aeabi_uidivmod) UNWIND(.fnstart) @@ -348,8 +345,6 @@ UNWIND(.fnend) ENDPROC(__aeabi_idivmod) .popsection
-#endif - .pushsection .text.Ldiv0, "ax" Ldiv0: UNWIND(.fnstart)