From owner-svn-src-all@FreeBSD.ORG Tue Oct 14 09:53:48 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B8281065688; Tue, 14 Oct 2008 09:53:48 +0000 (UTC) (envelope-from raj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 09C828FC15; Tue, 14 Oct 2008 09:53:48 +0000 (UTC) (envelope-from raj@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9E9rleS001829; Tue, 14 Oct 2008 09:53:47 GMT (envelope-from raj@svn.freebsd.org) Received: (from raj@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9E9rlPR001827; Tue, 14 Oct 2008 09:53:47 GMT (envelope-from raj@svn.freebsd.org) Message-Id: <200810140953.m9E9rlPR001827@svn.freebsd.org> From: Rafal Jaworowski Date: Tue, 14 Oct 2008 09:53:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r183876 - in head/lib: libc/arm/gen libstand X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Oct 2008 09:53:48 -0000 Author: raj Date: Tue Oct 14 09:53:47 2008 New Revision: 183876 URL: http://svn.freebsd.org/changeset/base/183876 Log: Let libstand(3) build on ARM. This is a pre-requisite for loader(8) + U-Boot support library on this arch. Modified: head/lib/libc/arm/gen/_setjmp.S head/lib/libstand/Makefile Modified: head/lib/libc/arm/gen/_setjmp.S ============================================================================== --- head/lib/libc/arm/gen/_setjmp.S Tue Oct 14 08:44:27 2008 (r183875) +++ head/lib/libc/arm/gen/_setjmp.S Tue Oct 14 09:53:47 2008 (r183876) @@ -101,6 +101,10 @@ ENTRY(_longjmp) /* validation failed, die die die. */ botch: +#if !defined(_STANDALONE) bl PIC_SYM(_C_LABEL(longjmperror), PLT) bl PIC_SYM(_C_LABEL(abort), PLT) b . - 8 /* Cannot get here */ +#else + b . +#endif Modified: head/lib/libstand/Makefile ============================================================================== --- head/lib/libstand/Makefile Tue Oct 14 08:44:27 2008 (r183875) +++ head/lib/libstand/Makefile Tue Oct 14 09:53:47 2008 (r183876) @@ -32,6 +32,9 @@ CFLAGS+= -msoft-float -D_STANDALONE .if ${MACHINE_ARCH} == "amd64" CFLAGS+= -m32 -I. .endif +.if ${MACHINE_ARCH} == "arm" +CFLAGS+= -msoft-float -DSOFTFLOAT -D_STANDALONE +.endif # standalone components and stuff we have modified locally SRCS+= zutil.h __main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \ @@ -48,12 +51,17 @@ SRCS+= ntoh.c # string functions from libc .PATH: ${.CURDIR}/../libc/string .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" + ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" || \ + ${MACHINE_ARCH} == "arm" SRCS+= bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ memcpy.c memmove.c memset.c qdivrem.c rindex.c strcat.c strchr.c \ strcmp.c strcpy.c strcspn.c strlen.c strncat.c strncmp.c strncpy.c \ strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c .endif +.if ${MACHINE_ARCH} == "arm" +.PATH: ${.CURDIR}/../libc/arm/gen +SRCS+= divsi3.S +.endif .if ${MACHINE_ARCH} == "ia64" .PATH: ${.CURDIR}/../libc/ia64/string SRCS+= bcmp.c bcopy.S bzero.S ffs.S index.c memccpy.c memchr.c memcmp.c \