From 7d043514520e86c17db88b1dfc7fe04eb0ec4b96 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 7 Jan 2016 22:47:27 +0000 Subject: [PATCH] As a quick fix, import r257103 from upstream llvm trunk, and r257104 from upstream clang trunk, which sets the default debug tuning back to gdb. The lldb debug tuning is not yet grokked completely by our ELF manipulation tools. --- contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 2 +- contrib/llvm/tools/clang/lib/Driver/ToolChains.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 3466f3469f1..1f0c06f293a 100644 --- a/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -221,7 +221,7 @@ DwarfDebug::DwarfDebug(AsmPrinter *A, Module *M) // precedence; fall back to triple-based defaults. if (Asm->TM.Options.DebuggerTuning != DebuggerKind::Default) DebuggerTuning = Asm->TM.Options.DebuggerTuning; - else if (IsDarwin || TT.isOSFreeBSD()) + else if (IsDarwin) DebuggerTuning = DebuggerKind::LLDB; else if (TT.isPS4CPU()) DebuggerTuning = DebuggerKind::SCE; diff --git a/contrib/llvm/tools/clang/lib/Driver/ToolChains.h b/contrib/llvm/tools/clang/lib/Driver/ToolChains.h index f4b6b1529b3..b6fd42696ed 100644 --- a/contrib/llvm/tools/clang/lib/Driver/ToolChains.h +++ b/contrib/llvm/tools/clang/lib/Driver/ToolChains.h @@ -730,9 +730,6 @@ public: // Until dtrace (via CTF) and LLDB can deal with distributed debug info, // FreeBSD defaults to standalone/full debug info. bool GetDefaultStandaloneDebug() const override { return true; } - llvm::DebuggerKind getDefaultDebuggerTuning() const override { - return llvm::DebuggerKind::LLDB; - } protected: Tool *buildAssembler() const override;