From owner-svn-src-all@freebsd.org  Tue Jan 19 17:40:30 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 62EB9A8708B;
 Tue, 19 Jan 2016 17:40:30 +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 2E9EA153A;
 Tue, 19 Jan 2016 17:40:30 +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 u0JHeTCN073200;
 Tue, 19 Jan 2016 17:40:29 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0JHeTkx073199;
 Tue, 19 Jan 2016 17:40:29 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201601191740.u0JHeTkx073199@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 17:40:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294331 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
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: Tue, 19 Jan 2016 17:40:30 -0000

Author: emaste
Date: Tue Jan 19 17:40:29 2016
New Revision: 294331
URL: https://svnweb.freebsd.org/changeset/base/294331

Log:
  Remove local override for .cpp.o and .cpp.po rules
  
  The local build rule used to set -fvisibility=hidden and -fPIC, in
  addition to -fexceptions and -D defines that had no effect.
  
  With -fvisibility=hidden and -fPIC in STATIC_CXXFLAGS the standard
  bsd.lib.mk rules are suitable for libgcc_s's C++ source.
  
  PR:		206381
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/gnu/lib/libgcc/Makefile

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile	Tue Jan 19 17:20:07 2016	(r294330)
+++ head/gnu/lib/libgcc/Makefile	Tue Jan 19 17:40:29 2016	(r294331)
@@ -89,6 +89,7 @@ CFLAGS+=	-I${UNWINDINCDIR} -I${.CURDIR}
 CXXFLAGS+=	-std=c++11
 .endif
 CXXFLAGS+=	-fno-rtti
+STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
 
 .else # MK_LLVM_LIBUNWIND
 
@@ -204,8 +205,6 @@ HIDE =  -fvisibility=hidden -DHIDE_EXPOR
 CC_T =	${CC} -c ${CFLAGS} ${HIDE} -fPIC
 CC_P =	${CC} -c ${CFLAGS} ${HIDE} -p -fPIC
 CC_S =	${CC} -c ${CFLAGS} ${PICFLAG} -DSHARED
-CXX_T =	${CXX} -c ${CXXFLAGS} ${HIDE} -fPIC
-CXX_P =	${CXX} -c ${CXXFLAGS} ${HIDE} -p -fPIC
 
 #-----------------------------------------------------------------------
 #
@@ -326,12 +325,6 @@ ${_src:R:S/$/.o/}: ${_src} ${COMMONHDRS}
 ${_src:R:S/$/.po/}: ${_src} ${COMMONHDRS}
 	${CC_P} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
 .endfor
-.for _src in ${LIB2ADDEHSTATIC:M*.cpp}
-${_src:R:S/$/.o/}: ${_src} ${COMMONHDRS}
-	${CXX_T} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
-${_src:R:S/$/.po/}: ${_src} ${COMMONHDRS}
-	${CXX_P} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}
-.endfor
 .for _src in ${LIB2ADDEHSHARED:M*.c}
 ${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS}
 	${CC_S} ${EH_CFLAGS} -o ${.TARGET} ${.IMPSRC}