From owner-svn-src-user@FreeBSD.ORG Fri Oct 22 14:07:13 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F726106566C; Fri, 22 Oct 2010 14:07:13 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3EEAD8FC2A; Fri, 22 Oct 2010 14:07:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9ME7D4U052911; Fri, 22 Oct 2010 14:07:13 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9ME7DYQ052909; Fri, 22 Oct 2010 14:07:13 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201010221407.o9ME7DYQ052909@svn.freebsd.org> From: Ed Schouten Date: Fri, 22 Oct 2010 14:07:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r214205 - user/ed/compiler-rt/lib/libcompiler_rt X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2010 14:07:13 -0000 Author: ed Date: Fri Oct 22 14:07:12 2010 New Revision: 214205 URL: http://svn.freebsd.org/changeset/base/214205 Log: Make libcompiler_rt build properly on mips and arm. The optimized assembly files for arm use a different syntax as the one supported by GNU as. Also, some of the routines provided by libcompiler_rt are also part of libc's. Modified: user/ed/compiler-rt/lib/libcompiler_rt/Makefile Modified: user/ed/compiler-rt/lib/libcompiler_rt/Makefile ============================================================================== --- user/ed/compiler-rt/lib/libcompiler_rt/Makefile Fri Oct 22 14:01:11 2010 (r214204) +++ user/ed/compiler-rt/lib/libcompiler_rt/Makefile Fri Oct 22 14:07:12 2010 (r214205) @@ -18,27 +18,130 @@ CRTSRC=${.CURDIR}/../../contrib/compiler .PATH: ${CRTSRC}/${CRTARCH} ${CRTSRC} -SRCF= absvdi2 absvsi2 absvti2 adddf3 addsf3 addvdi3 addvsi3 addvti3 \ - apple_versioning ashldi3 ashlti3 ashrdi3 ashrti3 clear_cache \ - clzdi2 clzsi2 clzti2 cmpdi2 cmpti2 comparedf2 comparesf2 \ - ctzdi2 ctzsi2 ctzti2 divdc3 divdf3 divdi3 divsc3 divsf3 divsi3 \ - divti3 divxc3 enable_execute_stack eprintf extendsfdf2 ffsdi2 \ - ffsti2 fixdfdi fixdfsi fixdfti fixsfdi fixsfsi fixsfti \ - fixunsdfdi fixunsdfsi fixunsdfti fixunssfdi fixunssfsi \ - fixunssfti fixunsxfdi fixunsxfsi fixunsxfti fixxfdi fixxfti \ - floatdidf floatdisf floatdixf floatsidf floatsisf floattidf \ - floattisf floattixf floatundidf floatundisf floatundixf \ - floatunsidf floatunsisf floatuntidf floatuntisf floatuntixf \ - gcc_personality_v0 lshrdi3 lshrti3 moddi3 modsi3 modti3 muldc3 \ - muldf3 muldi3 mulsc3 mulsf3 multi3 mulvdi3 mulvsi3 mulvti3 \ - mulxc3 negdf2 negdi2 negsf2 negti2 negvdi2 negvsi2 negvti2 \ - paritydi2 paritysi2 parityti2 popcountdi2 popcountsi2 \ - popcountti2 powidf2 powisf2 powitf2 powixf2 subvdi3 subvsi3 \ - subvti3 trampoline_setup truncdfsf2 ucmpdi2 ucmpti2 udivdi3 \ - udivmoddi4 udivmodti4 udivsi3 udivti3 umoddi3 umodsi3 umodti3 +SRCF= absvdi2 \ + absvsi2 \ + absvti2 \ + addvdi3 \ + addvsi3 \ + addvti3 \ + ashldi3 \ + ashlti3 \ + ashrdi3 \ + ashrti3 \ + clear_cache \ + clzdi2 \ + clzsi2 \ + clzti2 \ + cmpdi2 \ + cmpti2 \ + comparedf2 \ + comparesf2 \ + ctzdi2 \ + ctzsi2 \ + ctzti2 \ + divdc3 \ + divdi3 \ + divsc3 \ + divti3 \ + divxc3 \ + enable_execute_stack \ + eprintf \ + ffsdi2 \ + ffsti2 \ + fixdfdi \ + fixdfti \ + fixsfdi \ + fixsfti \ + fixunsdfdi \ + fixunsdfsi \ + fixunsdfti \ + fixunssfdi \ + fixunssfsi \ + fixunssfti \ + fixunsxfdi \ + fixunsxfsi \ + fixunsxfti \ + fixxfdi \ + fixxfti \ + floatdidf \ + floatdisf \ + floatdixf \ + floattidf \ + floattisf \ + floattixf \ + floatundidf \ + floatundisf \ + floatundixf \ + floatunsidf \ + floatunsisf \ + floatuntidf \ + floatuntisf \ + floatuntixf \ + gcc_personality_v0 \ + lshrdi3 \ + lshrti3 \ + moddi3 \ + modti3 \ + muldc3 \ + muldi3 \ + mulsc3 \ + multi3 \ + mulvdi3 \ + mulvsi3 \ + mulvti3 \ + mulxc3 \ + negdf2 \ + negdi2 \ + negsf2 \ + negti2 \ + negvdi2 \ + negvsi2 \ + negvti2 \ + paritydi2 \ + paritysi2 \ + parityti2 \ + popcountdi2 \ + popcountsi2 \ + popcountti2 \ + powidf2 \ + powisf2 \ + powitf2 \ + powixf2 \ + subvdi3 \ + subvsi3 \ + subvti3 \ + trampoline_setup \ + ucmpdi2 \ + ucmpti2 \ + udivdi3 \ + udivmoddi4 \ + udivmodti4 \ + udivti3 \ + umoddi3 \ + umodti3 + +# These are already shipped by libc.a on arm and mips +.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" +SRCF+= adddf3 \ + addsf3 \ + divdf3 \ + divsf3 \ + divsi3 \ + extendsfdf2 \ + fixdfsi \ + fixsfsi \ + floatsidf \ + floatsisf \ + modsi3 \ + muldf3 \ + mulsf3 \ + truncdfsf2 \ + udivsi3 \ + umodsi3 +.endif .for file in ${SRCF} -. if exists(${CRTSRC}/${CRTARCH}/${file}.S) +. if ${MACHINE_CPUARCH} != "arm" && exists(${CRTSRC}/${CRTARCH}/${file}.S) SRCS+= ${file}.S . else SRCS+= ${file}.c