From owner-svn-src-all@freebsd.org  Thu Oct 13 19:18:01 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA981C1054B;
 Thu, 13 Oct 2016 19:18:01 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A9EFD771;
 Thu, 13 Oct 2016 19:18:01 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9DJI08d085696;
 Thu, 13 Oct 2016 19:18:00 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9DJI0bX085695;
 Thu, 13 Oct 2016 19:18:00 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201610131918.u9DJI0bX085695@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 13 Oct 2016 19:18:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r307231 - head/lib/libgcc_s
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Oct 2016 19:18:02 -0000

Author: emaste
Date: Thu Oct 13 19:18:00 2016
New Revision: 307231
URL: https://svnweb.freebsd.org/changeset/base/307231

Log:
  libgcc_s: add libm dependencies from div{d,s,x}c3
  
  compiler-rt's complex division support routines contain calls to
  compiler builtins such as `__builtin_scalbnl`.  Unfortunately Clang
  turns these back into a call to `scalbnl`.
  
  For now link libm's C version of the required support routines.
  
  Reviewed by:	ed
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D8190

Modified:
  head/lib/libgcc_s/Makefile

Modified: head/lib/libgcc_s/Makefile
==============================================================================
--- head/lib/libgcc_s/Makefile	Thu Oct 13 18:57:18 2016	(r307230)
+++ head/lib/libgcc_s/Makefile	Thu Oct 13 19:18:00 2016	(r307231)
@@ -11,4 +11,22 @@ VERSION_MAP=	${.CURDIR}/Version.map
 .include "../libcompiler_rt/Makefile.inc"
 .include "../libgcc_eh/Makefile.inc"
 
+LIBCSRCDIR=	${SRCTOP}/lib/libc
+LIBMSRCDIR=	${SRCTOP}/lib/msun/src
+CFLAGS+=	-I${LIBCSRCDIR}/include -I${LIBCSRCDIR}/${MACHINE_CPUARCH}
+CFLAGS+=	-I${LIBMSRCDIR}
+.PATH:		${LIBMSRCDIR}
+SRCS+=		s_fabs.c
+SRCS+=		s_fabsf.c
+SRCS+=		s_fabsl.c
+SRCS+=		s_fmax.c
+SRCS+=		s_fmaxf.c
+SRCS+=		s_fmaxl.c
+SRCS+=		s_logb.c
+SRCS+=		s_logbf.c
+SRCS+=		s_logbl.c
+SRCS+=		s_scalbn.c
+SRCS+=		s_scalbnf.c
+SRCS+=		s_scalbnl.c
+
 .include <bsd.lib.mk>