Date: Fri, 11 Apr 2014 18:40:30 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264350 - head/contrib/llvm/patches Message-ID: <201404111840.s3BIeU71084781@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Fri Apr 11 18:40:29 2014 New Revision: 264350 URL: http://svnweb.freebsd.org/changeset/base/264350 Log: Update the llvm/clang patch for r264345. Added: head/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff - copied, changed from r264345, head/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff Deleted: head/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff Copied and modified: head/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff (from r264345, head/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff) ============================================================================== --- head/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff Fri Apr 11 16:51:35 2014 (r264345, copy source) +++ head/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff Fri Apr 11 18:40:29 2014 (r264350) @@ -1,22 +1,20 @@ -This patch makes clang default to DWARF2 debug info format for FreeBSD -10.x and earlier. +This patch makes clang default to DWARF2 debug info format for FreeBSD. -Introduced here: http://svnweb.freebsd.org/changeset/base/263891 +Introduced here: http://svnweb.freebsd.org/changeset/base/264345 Index: tools/clang/lib/Driver/Tools.cpp =================================================================== --- tools/clang/lib/Driver/Tools.cpp +++ tools/clang/lib/Driver/Tools.cpp -@@ -2628,8 +2628,10 @@ void Clang::ConstructJob(Compilation &C, const Job +@@ -2627,8 +2635,9 @@ void Clang::ConstructJob(Compilation &C, const Job CmdArgs.push_back("-gdwarf-4"); else if (!A->getOption().matches(options::OPT_g0) && !A->getOption().matches(options::OPT_ggdb0)) { - // Default is dwarf-2 for darwin. - if (getToolChain().getTriple().isOSDarwin()) -+ // Default is dwarf-2 for darwin and FreeBSD <= 10. ++ // Default is dwarf-2 for darwin and FreeBSD. + const llvm::Triple &Triple = getToolChain().getTriple(); -+ if (Triple.isOSDarwin() || (Triple.getOS() == llvm::Triple::FreeBSD && -+ Triple.getOSMajorVersion() <= 10)) ++ if (Triple.isOSDarwin() || Triple.getOS() == llvm::Triple::FreeBSD) CmdArgs.push_back("-gdwarf-2"); else CmdArgs.push_back("-g");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404111840.s3BIeU71084781>