From owner-svn-src-all@FreeBSD.ORG Fri Jan 9 20:00:38 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5F8FA1A; Fri, 9 Jan 2015 20:00:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8B806A5; Fri, 9 Jan 2015 20:00:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t09K0cJZ051392; Fri, 9 Jan 2015 20:00:38 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t09K0cdb051391; Fri, 9 Jan 2015 20:00:38 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201501092000.t09K0cdb051391@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Fri, 9 Jan 2015 20:00:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276895 - head/lib/libcompiler_rt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Fri, 09 Jan 2015 20:00:38 -0000 Author: andrew Date: Fri Jan 9 20:00:37 2015 New Revision: 276895 URL: https://svnweb.freebsd.org/changeset/base/276895 Log: With the update of compiler-rt we try to build a number of files that don't build on some ARM platforms, provide symbols we already provide in libc, or don't exist. Remove these from the build. Some of these may return later on specific targets. Differential Revision: https://reviews.freebsd.org/D1468 Reviewed by: dim, imp Modified: head/lib/libcompiler_rt/Makefile Modified: head/lib/libcompiler_rt/Makefile ============================================================================== --- head/lib/libcompiler_rt/Makefile Fri Jan 9 19:37:12 2015 (r276894) +++ head/lib/libcompiler_rt/Makefile Fri Jan 9 20:00:37 2015 (r276895) @@ -36,8 +36,6 @@ SRCF= absvdi2 \ clzti2 \ cmpdi2 \ cmpti2 \ - comparedf2 \ - comparesf2 \ ctzdi2 \ ctzsi2 \ ctzti2 \ @@ -150,6 +148,11 @@ SRCF+= adddf3 \ truncdfsf2 .endif +.if ${MACHINE_CPUARCH} != "arm" +SRCF+= comparedf2 \ + comparesf2 +.endif + .if ${MACHINE_CPUARCH} != "mips" SRCF+= divsi3 \ modsi3 \ @@ -180,9 +183,7 @@ SRCS+= ${file}.c .endfor .if ${MACHINE_CPUARCH} == "arm" -SRCS+= aeabi_dcmp.S \ - aeabi_div0.S \ - aeabi_fcmp.S \ +SRCS+= aeabi_div0.c \ aeabi_idivmod.S \ aeabi_ldivmod.S \ aeabi_memcmp.S \ @@ -193,49 +194,11 @@ SRCS+= aeabi_dcmp.S \ aeabi_uldivmod.S \ bswapdi2.S \ bswapsi2.S \ - eqdf2.S \ - eqsf2.S \ - floatunssidf.S \ - floatunssisf.S \ - gedf2.S \ - gesf2.S \ - gtdf2.S \ - gtsf2.S \ - ledf2.S \ - lesf2.S \ - ltdf2.S \ - ltsf2.S \ - nedf2.S \ - nesf2.S \ - restore_vfp_d8_d15_regs.S \ - save_vfp_d8_d15_regs.S \ switch16.S \ switch32.S \ switch8.S \ switchu8.S \ - sync_fetch_and_add_4.S \ - sync_fetch_and_add_8.S \ - sync_fetch_and_and_4.S \ - sync_fetch_and_and_8.S \ - sync_fetch_and_max_4.S \ - sync_fetch_and_max_8.S \ - sync_fetch_and_min_4.S \ - sync_fetch_and_min_8.S \ - sync_fetch_and_nand_4.S \ - sync_fetch_and_nand_8.S \ - sync_fetch_and_or_4.S \ - sync_fetch_and_or_8.S \ - sync_fetch_and_sub_4.S \ - sync_fetch_and_sub_8.S \ - sync_fetch_and_umax_4.S \ - sync_fetch_and_umax_8.S \ - sync_fetch_and_umin_4.S \ - sync_fetch_and_umin_8.S \ - sync_fetch_and_xor_4.S \ - sync_fetch_and_xor_8.S \ - sync_synchronize.S \ - unorddf2.S \ - unordsf2.S + sync_synchronize.S .endif .if ${MK_INSTALLLIB} != "no"