svn commit: r246369 - in head: lib/libstand sys/boot/arm/uboot

[Andrew Turner]

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}