Page MenuHomeFreeBSD

Add ELF Tool Chain's c++filt to the build
ClosedPublic

Authored by emaste on Apr 30 2015, 3:00 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Nov 21, 7:53 AM
Unknown Object (File)
Wed, Nov 20, 4:39 AM
Unknown Object (File)
Thu, Nov 14, 7:54 AM
Unknown Object (File)
Fri, Nov 8, 3:46 AM
Unknown Object (File)
Mon, Nov 4, 2:11 AM
Unknown Object (File)
Sun, Nov 3, 11:53 AM
Unknown Object (File)
Sun, Nov 3, 11:52 AM
Unknown Object (File)
Sun, Nov 3, 11:52 AM

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste retitled this revision from to Add ELF Tool Chain's c++filt to the build.
emaste updated this object.
emaste edited the test plan for this revision. (Show Details)
emaste added a reviewer: brooks.
emaste added a subscriber: Unknown Object (MLST).

Oh - we also need either:

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index abc9876..12ee7f8 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -12,7 +12,10 @@ SUBDIR+= cpp
 .endif
 
 .if ${MK_CXX} != "no"
-SUBDIR+= cc1plus c++ c++filt
+SUBDIR+= cc1plus c++
+.if ${MK_ELFTOOLCHAIN_TOLOLS} != "no"
+SUBDIR+= c++filt
+.endif
 .endif
 
 .if ${MK_GCOV} != "no"

or

--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -238,7 +238,9 @@ SUBDIR+=    ee
 
 .if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
 _addr2line=    addr2line
+.if ${MK_GCC} != "no" && ${MK_CXX} != "no"
 _cxxfilt=      cxxfilt
+.endif
 _elfcopy=      elfcopy
 _nm=           nm
 _readelf=      readelf

s/MK_ELFTOOLCHAIN_TOLOLS/MK_ELFTOOLCHAIN_TOOLS/ required :)

emaste edited edge metadata.
  • prefer ELF Tool Chain's c++filt
  • exclude from make delete-old
  • fix typo
gnu/usr.bin/cc/Makefile
16 ↗(On Diff #5108)

Sigh, this is backwards.
Will update to == "no" - i.e., build GCC's c++filt in the WITHOUT_ELFTOOLCHAIN_TOOLS case.

brooks edited edge metadata.

Looks good to me.

This revision is now accepted and ready to land.Apr 30 2015, 3:43 PM
imp added a reviewer: imp.
imp added a subscriber: imp.

I came to troll you for TOLO -> YOLO, but brooks beat me to it...

This revision was automatically updated to reflect the committed changes.