Date: Tue, 19 Jan 2016 03:54:38 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r294308 - head/gnu/lib/libgcc Message-ID: <201601190354.u0J3scG4026121@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 #-----------------------------------------------------------------------
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601190354.u0J3scG4026121>