Fix ixp425 boot2 with ARM EABI:

- libkern is missing __aeabi_llsl, implement this by calling __ashldi3.
 - Because of how the asm entry macros are defined the boot2 code
   requires the unwind symbols to exist, include them in boot2.

Approved by:	re (marius)
This commit is contained in:
Andrew Turner 2013-09-29 15:19:34 +00:00
parent 278bc67bbc
commit ca49624410
3 changed files with 19 additions and 0 deletions

View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
.include <bsd.own.mk>
# We get a lot of the std lib functions from here. # We get a lot of the std lib functions from here.
.PATH: ${.CURDIR}/../../at91/libat91 .PATH: ${.CURDIR}/../../at91/libat91
@ -15,6 +17,9 @@ FILES=${P}
SRCS=arm_init.S boot2.c ${BOOT_FLAVOR:tl}_board.c SRCS=arm_init.S boot2.c ${BOOT_FLAVOR:tl}_board.c
SRCS+=memchr.c memcmp.c memcpy.c memmem.c memset.c printf.c strcmp.c strcpy.c SRCS+=memchr.c memcmp.c memcpy.c memmem.c memset.c printf.c strcmp.c strcpy.c
SRCS+=strlen.c ashldi3.c divsi3.S muldi3.c SRCS+=strlen.c ashldi3.c divsi3.S muldi3.c
.if ${MK_ARM_EABI} != "no"
SRCS+=aeabi_unwind.c
.endif
NO_MAN= NO_MAN=
KERNPHYSADDR=0x180000 KERNPHYSADDR=0x180000

View File

@ -29,7 +29,11 @@
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/types.h> #include <sys/types.h>
#ifdef _KERNEL
#include <sys/systm.h> #include <sys/systm.h>
#else
#define panic(x) (void)0
#endif
#ifdef __ARM_EABI__ #ifdef __ARM_EABI__
/* We need to provide these functions never call them */ /* We need to provide these functions never call them */

View File

@ -59,3 +59,13 @@ __ashldi3(a, shift)
} }
return (aa.q); return (aa.q);
} }
#ifdef __ARM_EABI__
long long __aeabi_llsl(long long, int);
long long
__aeabi_llsl(long long a, int b)
{
return __ashldi3(a, b);
}
#endif