Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Jan 2016 22:47:27 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r293386 - in projects/clang380-import/contrib/llvm: lib/CodeGen/AsmPrinter tools/clang/lib/Driver
Message-ID:  <201601072247.u07MlR7e079533@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Thu Jan  7 22:47:27 2016
New Revision: 293386
URL: https://svnweb.freebsd.org/changeset/base/293386

Log:
  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.

Modified:
  projects/clang380-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
  projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.h

Modified: projects/clang380-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
==============================================================================
--- projects/clang380-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	Thu Jan  7 22:45:50 2016	(r293385)
+++ projects/clang380-import/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp	Thu Jan  7 22:47:27 2016	(r293386)
@@ -221,7 +221,7 @@ DwarfDebug::DwarfDebug(AsmPrinter *A, Mo
   // 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;

Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
==============================================================================
--- projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.h	Thu Jan  7 22:45:50 2016	(r293385)
+++ projects/clang380-import/contrib/llvm/tools/clang/lib/Driver/ToolChains.h	Thu Jan  7 22:47:27 2016	(r293386)
@@ -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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601072247.u07MlR7e079533>