Date: Sun, 29 Sep 2013 15:19:35 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255939 - in head/sys: boot/arm/ixp425/boot2 libkern libkern/arm Message-ID: <201309291519.r8TFJZHJ049999@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Sun Sep 29 15:19:34 2013 New Revision: 255939 URL: http://svnweb.freebsd.org/changeset/base/255939 Log: 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) Modified: head/sys/boot/arm/ixp425/boot2/Makefile head/sys/libkern/arm/aeabi_unwind.c head/sys/libkern/ashldi3.c Modified: head/sys/boot/arm/ixp425/boot2/Makefile ============================================================================== --- head/sys/boot/arm/ixp425/boot2/Makefile Sun Sep 29 14:06:19 2013 (r255938) +++ head/sys/boot/arm/ixp425/boot2/Makefile Sun Sep 29 15:19:34 2013 (r255939) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <bsd.own.mk> + # We get a lot of the std lib functions from here. .PATH: ${.CURDIR}/../../at91/libat91 @@ -15,6 +17,9 @@ FILES=${P} 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+=strlen.c ashldi3.c divsi3.S muldi3.c +.if ${MK_ARM_EABI} != "no" +SRCS+=aeabi_unwind.c +.endif NO_MAN= KERNPHYSADDR=0x180000 Modified: head/sys/libkern/arm/aeabi_unwind.c ============================================================================== --- head/sys/libkern/arm/aeabi_unwind.c Sun Sep 29 14:06:19 2013 (r255938) +++ head/sys/libkern/arm/aeabi_unwind.c Sun Sep 29 15:19:34 2013 (r255939) @@ -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 */ Modified: head/sys/libkern/ashldi3.c ============================================================================== --- head/sys/libkern/ashldi3.c Sun Sep 29 14:06:19 2013 (r255938) +++ head/sys/libkern/ashldi3.c Sun Sep 29 15:19:34 2013 (r255939) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309291519.r8TFJZHJ049999>