From owner-freebsd-toolchain@FreeBSD.ORG Thu Apr 30 15:39:34 2015 Return-Path: Delivered-To: freebsd-toolchain@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2B9FF95 for ; Thu, 30 Apr 2015 15:39:34 +0000 (UTC) Received: from phabric-backend.isc.freebsd.org (phabric-backend.isc.freebsd.org [IPv6:2001:4f8:3:ffe0:406a:0:50:2]) (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 B0D151942 for ; Thu, 30 Apr 2015 15:39:34 +0000 (UTC) Received: from phabric-backend.isc.freebsd.org (phabric-backend.isc.freebsd.org [127.0.1.5]) by phabric-backend.isc.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UFdYkg059720 for ; Thu, 30 Apr 2015 15:39:34 GMT (envelope-from daemon-user@phabric-backend.isc.freebsd.org) Received: (from daemon-user@localhost) by phabric-backend.isc.freebsd.org (8.14.9/8.14.9/Submit) id t3UFdYoK059719; Thu, 30 Apr 2015 15:39:34 GMT (envelope-from daemon-user) Date: Thu, 30 Apr 2015 15:39:34 +0000 To: freebsd-toolchain@freebsd.org From: "emaste (Ed Maste)" Subject: [Differential] [Updated, 26 lines] D2408: Add ELF Tool Chain's c++filt to the build Message-ID: X-Priority: 3 Thread-Topic: D2408: Add ELF Tool Chain's c++filt to the build X-Herald-Rules: none X-Phabricator-To: X-Phabricator-To: X-Phabricator-Cc: In-Reply-To: References: Thread-Index: NTlmNTU4Y2I5N2RjNDEwM2E5OWYxY2VlZTc3IFVCTLY= Precedence: bulk X-Phabricator-Sent-This-Message: Yes X-Mail-Transport-Agent: MetaMTA X-Auto-Response-Suppress: All X-Phabricator-Mail-Tags: , , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_e0054449863fc0ba6e9256b56bb4b064" X-BeenThere: freebsd-toolchain@freebsd.org X-Mailman-Version: 2.1.20 List-Id: Maintenance of FreeBSD's integrated toolchain List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 15:39:34 -0000 --b1_e0054449863fc0ba6e9256b56bb4b064 Content-Type: text/plain; charset = "utf-8" Content-Transfer-Encoding: 8bit emaste updated this revision to Diff 5108. emaste added a comment. - prefer ELF Tool Chain's c++filt - exclude from make delete-old - fix typo CHANGES SINCE LAST UPDATE https://reviews.freebsd.org/D2408?vs=5105&id=5108 REVISION DETAIL https://reviews.freebsd.org/D2408 AFFECTED FILES gnu/usr.bin/cc/Makefile tools/build/mk/OptionalObsoleteFiles.inc usr.bin/Makefile usr.bin/cxxfilt/Makefile CHANGE DETAILS diff --git a/usr.bin/cxxfilt/Makefile b/usr.bin/cxxfilt/Makefile new file mode 100644 --- /dev/null +++ b/usr.bin/cxxfilt/Makefile @@ -0,0 +1,17 @@ +# $FreeBSD$ + +.include + +ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain +SRCDIR= ${ELFTCDIR}/cxxfilt + +.PATH: ${SRCDIR} + +PROG= c++filt +SRCS= cxxfilt.c + +LIBADD= elftc + +CFLAGS+=-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/common + +.include diff --git a/usr.bin/Makefile b/usr.bin/Makefile --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -36,6 +36,7 @@ csplit \ ctlstat \ cut \ + ${_cxxfilt} \ demandoc \ dirname \ dpv \ @@ -237,6 +238,7 @@ .if ${MK_ELFTOOLCHAIN_TOOLS} != "no" _addr2line= addr2line +_cxxfilt= cxxfilt _elfcopy= elfcopy _nm= nm _readelf= readelf diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1004,7 +1004,9 @@ .if ${MK_CXX} == no OLD_FILES+=usr/bin/CC OLD_FILES+=usr/bin/c++ +.if ${MK_ELFTOOLCHAIN_TOOLS} == no OLD_FILES+=usr/bin/c++filt +.endif OLD_FILES+=usr/bin/g++ OLD_FILES+=usr/libexec/cc1plus .if ${MK_GCC} == no diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile --- a/gnu/usr.bin/cc/Makefile +++ b/gnu/usr.bin/cc/Makefile @@ -12,7 +12,10 @@ .endif .if ${MK_CXX} != "no" -SUBDIR+= cc1plus c++ c++filt +SUBDIR+= cc1plus c++ +.if ${MK_ELFTOOLCHAIN_TOOLS} != "no" +SUBDIR+= c++filt +.endif .endif .if ${MK_GCOV} != "no" EMAIL PREFERENCES https://reviews.freebsd.org/settings/panel/emailpreferences/ To: emaste, brooks Cc: freebsd-toolchain --b1_e0054449863fc0ba6e9256b56bb4b064 Content-Type: text/x-patch; charset=utf-8; name="D2408.5108.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="D2408.5108.patch" ZGlmZiAtLWdpdCBhL3Vzci5iaW4vY3h4ZmlsdC9NYWtlZmlsZSBiL3Vzci5iaW4vY3h4ZmlsdC9N YWtlZmlsZQpuZXcgZmlsZSBtb2RlIDEwMDY0NAotLS0gL2Rldi9udWxsCisrKyBiL3Vzci5iaW4v Y3h4ZmlsdC9NYWtlZmlsZQpAQCAtMCwwICsxLDE3IEBACisjICRGcmVlQlNEJAorCisuaW5jbHVk ZSA8c3JjLm9wdHMubWs+CisKK0VMRlRDRElSPQkkey5DVVJESVJ9Ly4uLy4uL2NvbnRyaWIvZWxm dG9vbGNoYWluCitTUkNESVI9CQkke0VMRlRDRElSfS9jeHhmaWx0CisKKy5QQVRIOiAke1NSQ0RJ Un0KKworUFJPRz0JYysrZmlsdAorU1JDUz0JY3h4ZmlsdC5jCisKK0xJQkFERD0JZWxmdGMKKwor Q0ZMQUdTKz0tSSR7RUxGVENESVJ9L2xpYmVsZnRjIC1JJHtFTEZUQ0RJUn0vY29tbW9uCisKKy5p bmNsdWRlIDxic2QucHJvZy5taz4KZGlmZiAtLWdpdCBhL3Vzci5iaW4vTWFrZWZpbGUgYi91c3Iu YmluL01ha2VmaWxlCi0tLSBhL3Vzci5iaW4vTWFrZWZpbGUKKysrIGIvdXNyLmJpbi9NYWtlZmls ZQpAQCAtMzYsNiArMzYsNyBAQAogCWNzcGxpdCBcCiAJY3Rsc3RhdCBcCiAJY3V0IFwKKwkke19j eHhmaWx0fSBcCiAJZGVtYW5kb2MgXAogCWRpcm5hbWUgXAogCWRwdiBcCkBAIC0yMzcsNiArMjM4 LDcgQEAKIAogLmlmICR7TUtfRUxGVE9PTENIQUlOX1RPT0xTfSAhPSAibm8iCiBfYWRkcjJsaW5l PQlhZGRyMmxpbmUKK19jeHhmaWx0PQljeHhmaWx0CiBfZWxmY29weT0JZWxmY29weQogX25tPQkJ bm0KIF9yZWFkZWxmPQlyZWFkZWxmCmRpZmYgLS1naXQgYS90b29scy9idWlsZC9tay9PcHRpb25h bE9ic29sZXRlRmlsZXMuaW5jIGIvdG9vbHMvYnVpbGQvbWsvT3B0aW9uYWxPYnNvbGV0ZUZpbGVz LmluYwotLS0gYS90b29scy9idWlsZC9tay9PcHRpb25hbE9ic29sZXRlRmlsZXMuaW5jCisrKyBi L3Rvb2xzL2J1aWxkL21rL09wdGlvbmFsT2Jzb2xldGVGaWxlcy5pbmMKQEAgLTEwMDQsNyArMTAw NCw5IEBACiAuaWYgJHtNS19DWFh9ID09IG5vCiBPTERfRklMRVMrPXVzci9iaW4vQ0MKIE9MRF9G SUxFUys9dXNyL2Jpbi9jKysKKy5pZiAke01LX0VMRlRPT0xDSEFJTl9UT09MU30gPT0gbm8KIE9M RF9GSUxFUys9dXNyL2Jpbi9jKytmaWx0CisuZW5kaWYKIE9MRF9GSUxFUys9dXNyL2Jpbi9nKysK IE9MRF9GSUxFUys9dXNyL2xpYmV4ZWMvY2MxcGx1cwogLmlmICR7TUtfR0NDfSA9PSBubwpkaWZm IC0tZ2l0IGEvZ251L3Vzci5iaW4vY2MvTWFrZWZpbGUgYi9nbnUvdXNyLmJpbi9jYy9NYWtlZmls ZQotLS0gYS9nbnUvdXNyLmJpbi9jYy9NYWtlZmlsZQorKysgYi9nbnUvdXNyLmJpbi9jYy9NYWtl ZmlsZQpAQCAtMTIsNyArMTIsMTAgQEAKIC5lbmRpZgogCiAuaWYgJHtNS19DWFh9ICE9ICJubyIK LVNVQkRJUis9IGNjMXBsdXMgYysrIGMrK2ZpbHQKK1NVQkRJUis9IGNjMXBsdXMgYysrCisuaWYg JHtNS19FTEZUT09MQ0hBSU5fVE9PTFN9ICE9ICJubyIKK1NVQkRJUis9IGMrK2ZpbHQKKy5lbmRp ZgogLmVuZGlmCiAKIC5pZiAke01LX0dDT1Z9ICE9ICJubyIKCg== --b1_e0054449863fc0ba6e9256b56bb4b064--