From owner-svn-src-head@FreeBSD.ORG  Tue Feb  5 20:03:59 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0202AB23;
 Tue,  5 Feb 2013 20:03:59 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CB33E378;
 Tue,  5 Feb 2013 20:03:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r15K3w9C012728;
 Tue, 5 Feb 2013 20:03:58 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r15K3wQu012726;
 Tue, 5 Feb 2013 20:03:58 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201302052003.r15K3wQu012726@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 5 Feb 2013 20:03:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246369 - in head: lib/libstand sys/boot/arm/uboot
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: Tue, 05 Feb 2013 20:03:59 -0000

Author: andrew
Date: Tue Feb  5 20:03:58 2013
New Revision: 246369
URL: http://svnweb.freebsd.org/changeset/base/246369

Log:
  * Add the integer div & mod functions and ARM EABI support functions to
    libstand.
  * Stop linking the ARM U-Boot loader against libgcc now libstand has the
    required symbols.

Modified:
  head/lib/libstand/Makefile
  head/sys/boot/arm/uboot/Makefile

Modified: head/lib/libstand/Makefile
==============================================================================
--- head/lib/libstand/Makefile	Tue Feb  5 19:10:50 2013	(r246368)
+++ head/lib/libstand/Makefile	Tue Feb  5 20:03:58 2013	(r246369)
@@ -61,7 +61,20 @@ SRCS+=	bcmp.c bcopy.c bzero.c ffs.c memc
 .endif
 .if ${MACHINE_CPUARCH} == "arm"
 .PATH: ${.CURDIR}/../libc/arm/gen
+
+.if ${MK_ARM_EABI} == "no"
 SRCS+= divsi3.S
+.else
+# Compiler support functions
+.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/
+SRCS+=	 divmoddi4.c  divmodsi4.c  divdi3.c  divsi3.c  moddi3.c  modsi3.c
+SRCS+=	udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c
+
+.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/arm/
+SRCS+=	aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
+SRCS+=	aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
+.endif
+
 .endif
 .if ${MACHINE_CPUARCH} == "ia64"
 .PATH: ${.CURDIR}/../libc/ia64/string

Modified: head/sys/boot/arm/uboot/Makefile
==============================================================================
--- head/sys/boot/arm/uboot/Makefile	Tue Feb  5 19:10:50 2013	(r246368)
+++ head/sys/boot/arm/uboot/Makefile	Tue Feb  5 20:03:58 2013	(r246369)
@@ -112,8 +112,8 @@ CFLAGS+=	-I${.CURDIR}/../../../../lib/li
 # clang doesn't understand %D as a specifier to printf
 NO_WERROR.clang=
 
-DPADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND} ${LIBGCC}
-LDADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand -lgcc
+DPADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBSTAND}
+LDADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} -lstand
 
 vers.c:	${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
 	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}