From c4601d6dfb3356d58dd5e7335e7cbc8acb1d6f0f Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 19 Jan 2016 03:54:38 +0000
Subject: 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
---
 gnu/lib/libgcc/Makefile | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'gnu')

diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index ad4e0f1fd382..040fdff47d65 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -206,7 +206,6 @@ 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
-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
 
 
 #-----------------------------------------------------------------------
-- 
cgit v1.3


From 0c9eb4d63a6d7280dc19ebfd6a6c34530e26c8aa Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 19 Jan 2016 17:40:29 +0000
Subject: 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
---
 gnu/lib/libgcc/Makefile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'gnu')

diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 040fdff47d65..ec3c7f4185ff 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -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_EXPORTS
 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}
-- 
cgit v1.3