From owner-svn-src-head@FreeBSD.ORG  Sun Sep 29 15:19:35 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D87CE1AC;
 Sun, 29 Sep 2013 15:19:35 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AB8352B1E;
 Sun, 29 Sep 2013 15:19:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8TFJZxP050003;
 Sun, 29 Sep 2013 15:19:35 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8TFJZHJ049999;
 Sun, 29 Sep 2013 15:19:35 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201309291519.r8TFJZHJ049999@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 29 Sep 2013 15:19:35 +0000 (UTC)
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
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Sep 2013 15:19:35 -0000

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