diff options
| author | andrew <andrew@FreeBSD.org> | 2013-09-29 15:19:34 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2013-09-29 15:19:34 +0000 |
| commit | f093c579801a670d1ae7a75f29919c66b2adae40 (patch) | |
| tree | 1f80d6e09e6058325835fee05bc3935f6376bfd2 /sys/libkern | |
| parent | cfb10412f3e8f2f4b2569f41eb49430373d28514 (diff) | |
| download | FreeBSD-src-f093c579801a670d1ae7a75f29919c66b2adae40.zip FreeBSD-src-f093c579801a670d1ae7a75f29919c66b2adae40.tar.gz | |
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)
Diffstat (limited to 'sys/libkern')
| -rw-r--r-- | sys/libkern/arm/aeabi_unwind.c | 4 | ||||
| -rw-r--r-- | sys/libkern/ashldi3.c | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/sys/libkern/arm/aeabi_unwind.c b/sys/libkern/arm/aeabi_unwind.c index 098e6e6..efaf58d 100644 --- a/sys/libkern/arm/aeabi_unwind.c +++ b/sys/libkern/arm/aeabi_unwind.c @@ -29,7 +29,11 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> +#ifdef _KERNEL #include <sys/systm.h> +#else +#define panic(x) (void)0 +#endif #ifdef __ARM_EABI__ /* We need to provide these functions never call them */ diff --git a/sys/libkern/ashldi3.c b/sys/libkern/ashldi3.c index 435a35a..4ad6974 100644 --- a/sys/libkern/ashldi3.c +++ b/sys/libkern/ashldi3.c @@ -59,3 +59,13 @@ __ashldi3(a, shift) } 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 |
