From owner-svn-src-projects@freebsd.org Thu Jan 7 22:47:29 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1215DA67B89 for ; Thu, 7 Jan 2016 22:47:29 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 BBC5D1A6B; Thu, 7 Jan 2016 22:47:28 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u07MlREO079535; Thu, 7 Jan 2016 22:47:27 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07MlR7e079533; Thu, 7 Jan 2016 22:47:27 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201601072247.u07MlR7e079533@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 7 Jan 2016 22:47:27 +0000 (UTC) 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 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2016 22:47:29 -0000 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;