From: Owen Anderson <resistor@mac.com>
Date: Thu, 29 Jan 2015 07:35:31 +0000 (+0000)
Subject: Use the existing build configuration parameter ENABLE_BACKTRACE to compile out all... 
X-Git-Tag: llvmorg-3.7.0-rc1~13757
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9253bb933aa5d85907f2ff20b9a56b6a4ae1722b;p=platform%2Fupstream%2Fllvm.git

Use the existing build configuration parameter ENABLE_BACKTRACE to compile out all pretty stack trace support when backtraces are disabled.

This has the nice secondary effect of allowing LLVM to continue to build
for targets without __thread or thread_local support to continue to work
so long as they build without support for backtraces.

llvm-svn: 227423
---

diff --git a/llvm/lib/Support/PrettyStackTrace.cpp b/llvm/lib/Support/PrettyStackTrace.cpp
index bf7b150..3f3b9d4 100644
--- a/llvm/lib/Support/PrettyStackTrace.cpp
+++ b/llvm/lib/Support/PrettyStackTrace.cpp
@@ -27,6 +27,11 @@
 
 using namespace llvm;
 
+// If backtrace support is not enabled, compile out support for pretty stack
+// traces.  This has the secondary effect of not requiring thread local storage
+// when backtrace support is disabled.
+#if ENABLE_BACKTRACE
+
 // We need a thread local pointer to manage the stack of our stack trace
 // objects, but we *really* cannot tolerate destructors running and do not want
 // to pay any overhead of synchronizing. As a consequence, we use a raw
@@ -103,16 +108,23 @@ static void CrashHandler(void *) {
 #endif
 }
 
+// ENABLE_BACKTRACE
+#endif
+
 PrettyStackTraceEntry::PrettyStackTraceEntry() {
+#if ENABLE_BACKTRACE
   // Link ourselves.
   NextEntry = PrettyStackTraceHead;
   PrettyStackTraceHead = this;
+#endif
 }
 
 PrettyStackTraceEntry::~PrettyStackTraceEntry() {
+#if ENABLE_BACKTRACE
   assert(PrettyStackTraceHead == this &&
          "Pretty stack trace entry destruction is out of order");
   PrettyStackTraceHead = getNextEntry();
+#endif
 }
 
 void PrettyStackTraceString::print(raw_ostream &OS) const {
@@ -127,15 +139,19 @@ void PrettyStackTraceProgram::print(raw_ostream &OS) const {
   OS << '\n';
 }
 
+#if ENABLE_BACKTRACE
 static bool RegisterCrashPrinter() {
   sys::AddSignalHandler(CrashHandler, nullptr);
   return false;
 }
+#endif
 
 void llvm::EnablePrettyStackTrace() {
+#if ENABLE_BACKTRACE
   // The first time this is called, we register the crash printer.
   static bool HandlerRegistered = RegisterCrashPrinter();
   (void)HandlerRegistered;
+#endif
 }
 
 void LLVMEnablePrettyStackTrace() {