From owner-svn-src-projects@FreeBSD.ORG Mon Feb 6 08:46:01 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 095E9106564A; Mon, 6 Feb 2012 08:46:01 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E26618FC13; Mon, 6 Feb 2012 08:46:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q168k0T7024584; Mon, 6 Feb 2012 08:46:00 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q168k0TO024579; Mon, 6 Feb 2012 08:46:00 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201202060846.q168k0TO024579@svn.freebsd.org> From: Andrew Turner Date: Mon, 6 Feb 2012 08:46:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231065 - in projects/arm_eabi/lib/libc/arm: . gen X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Feb 2012 08:46:01 -0000 Author: andrew Date: Mon Feb 6 08:46:00 2012 New Revision: 231065 URL: http://svn.freebsd.org/changeset/base/231065 Log: * Move the old symbols moved to compiler-rt out of the ARM Symbol.map to an OABI map file. * Stop compiling divsi3.S as it provides symbols we have in compiler-rt Added: projects/arm_eabi/lib/libc/arm/Symbol_oabi.map Modified: projects/arm_eabi/lib/libc/arm/Makefile.inc projects/arm_eabi/lib/libc/arm/Symbol.map projects/arm_eabi/lib/libc/arm/gen/Makefile.inc Modified: projects/arm_eabi/lib/libc/arm/Makefile.inc ============================================================================== --- projects/arm_eabi/lib/libc/arm/Makefile.inc Mon Feb 6 08:40:34 2012 (r231064) +++ projects/arm_eabi/lib/libc/arm/Makefile.inc Mon Feb 6 08:46:00 2012 (r231065) @@ -8,3 +8,6 @@ SOFTFLOAT_BITS=32 # Long double is just double precision. MDSRCS+=machdep_ldisd.c SYM_MAPS+=${.CURDIR}/arm/Symbol.map + +# This contains the symbols that were removed when moving to the ARM EABI +#SYM_MAPS+=${.CURDIR}/arm/Symbol_oabi.map Modified: projects/arm_eabi/lib/libc/arm/Symbol.map ============================================================================== --- projects/arm_eabi/lib/libc/arm/Symbol.map Mon Feb 6 08:40:34 2012 (r231064) +++ projects/arm_eabi/lib/libc/arm/Symbol.map Mon Feb 6 08:46:00 2012 (r231065) @@ -41,10 +41,6 @@ FBSDprivate_1.0 { _set_tp; ___longjmp; - __umodsi3; - __modsi3; - __udivsi3; - __divsi3; __makecontext; __longjmp; signalcontext; @@ -57,22 +53,4 @@ FBSDprivate_1.0 { curbrk; minbrk; _sbrk; - - /* softfloat */ - __addsf3; - __adddf3; - __subsf3; - __subdf3; - __mulsf3; - __muldf3; - __divsf3; - __divdf3; - __floatsisf; - __floatsidf; - __fixsfsi; - __fixdfsi; - __fixunssfsi; - __fixunsdfsi; - __extendsfdf2; - __truncdfsf2; }; Added: projects/arm_eabi/lib/libc/arm/Symbol_oabi.map ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/arm_eabi/lib/libc/arm/Symbol_oabi.map Mon Feb 6 08:46:00 2012 (r231065) @@ -0,0 +1,34 @@ +/* + * $FreeBSD: projects/arm_eabi/lib/libc/arm/Symbol.map 228591 2011-12-16 19:38:31Z andrew $ + */ + +/* + * This only needs to contain symbols that are not listed in + * symbol maps from other parts of libc (i.e., not found in + * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...) + * and are not used in the ARM EABI. + */ +FBSDprivate_1.0 { + __umodsi3; + __modsi3; + __udivsi3; + __divsi3; + + /* softfloat */ + __addsf3; + __adddf3; + __subsf3; + __subdf3; + __mulsf3; + __muldf3; + __divsf3; + __divdf3; + __floatsisf; + __floatsidf; + __fixsfsi; + __fixdfsi; + __fixunssfsi; + __fixunsdfsi; + __extendsfdf2; + __truncdfsf2; +}; Modified: projects/arm_eabi/lib/libc/arm/gen/Makefile.inc ============================================================================== --- projects/arm_eabi/lib/libc/arm/gen/Makefile.inc Mon Feb 6 08:40:34 2012 (r231064) +++ projects/arm_eabi/lib/libc/arm/gen/Makefile.inc Mon Feb 6 08:46:00 2012 (r231065) @@ -3,4 +3,7 @@ SRCS+= _ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \ infinity.c ldexp.c makecontext.c \ - setjmp.S signalcontext.c sigsetjmp.S divsi3.S + setjmp.S signalcontext.c sigsetjmp.S + +#SRCS+= divsi3.S +