From owner-svn-src-head@freebsd.org  Tue Jan 19 03:54:39 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 886FBA88A60;
 Tue, 19 Jan 2016 03:54:39 +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 5A10A1F7C;
 Tue, 19 Jan 2016 03:54:39 +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 u0J3scD4026122;
 Tue, 19 Jan 2016 03:54:38 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0J3scG4026121;
 Tue, 19 Jan 2016 03:54:38 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201601190354.u0J3scG4026121@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: Tue, 19 Jan 2016 03:54:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294308 - head/gnu/lib/libgcc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jan 2016 03:54:39 -0000

Author: emaste
Date: Tue Jan 19 03:54:38 2016
New Revision: 294308
URL: https://svnweb.freebsd.org/changeset/base/294308

Log:
  Remove local override for .cpp.So rule
  
  The standard bsd.lib.mk rule is suitable for libgcc_s's C++ source.
  
  The local rule had the following non-functional argument differences
  or additions:
  
  1. -DSHARED (rather than -DPIC from bsd.lib.mk)
  
     The C++ sources don't have an #ifdef for either one.
  
  2. -fexceptions
  
     This is enabled by default for C++ so does not need to be set
     explicitly.
  
  3. -D__GLIBC__=3
  
     Not used by LLVM libunwind.
  
  4. -DElfW=__ElfN
  
     LLVM libunwind provides its own definition.
  
  PR:		206381
  Differential Revision:	The FreeBSD Foundation

Modified:
  head/gnu/lib/libgcc/Makefile

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile	Tue Jan 19 03:07:25 2016	(r294307)
+++ head/gnu/lib/libgcc/Makefile	Tue Jan 19 03:54:38 2016	(r294308)
@@ -206,7 +206,6 @@ CC_P =	${CC} -c ${CFLAGS} ${HIDE} -p -fP
 CC_S =	${CC} -c ${CFLAGS} ${PICFLAG} -DSHARED
 CXX_T =	${CXX} -c ${CXXFLAGS} ${HIDE} -fPIC
 CXX_P =	${CXX} -c ${CXXFLAGS} ${HIDE} -p -fPIC
-CXX_S =	${CXX} -c ${CXXFLAGS} ${PICFLAG} -DSHARED
 
 #-----------------------------------------------------------------------
 #
@@ -337,10 +336,6 @@ ${_src:R:S/$/.po/}: ${_src} ${COMMONHDRS
 ${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS}
 	${CC_S} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
 .endfor
-.for _src in ${LIB2ADDEHSHARED:M*.cpp}
-${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS}
-	${CXX_S} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
-.endfor
 
 
 #-----------------------------------------------------------------------