From 9cf177055234a452bf8b42becf69511c6fc54d03 Mon Sep 17 00:00:00 2001 From: dim Date: Fri, 11 Apr 2014 18:40:29 +0000 Subject: Update the llvm/clang patch for r264345. --- .../patches/patch-r263891-dwarf2-freebsd10.diff | 22 ---------------------- .../patches/patch-r264345-dwarf2-freebsd10.diff | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff create mode 100644 contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff (limited to 'contrib/llvm/patches') diff --git a/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff b/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff deleted file mode 100644 index 2bbf30c..0000000 --- a/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff +++ /dev/null @@ -1,22 +0,0 @@ -This patch makes clang default to DWARF2 debug info format for FreeBSD -10.x and earlier. - -Introduced here: http://svnweb.freebsd.org/changeset/base/263891 - -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 - 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. -+ const llvm::Triple &Triple = getToolChain().getTriple(); -+ if (Triple.isOSDarwin() || (Triple.getOS() == llvm::Triple::FreeBSD && -+ Triple.getOSMajorVersion() <= 10)) - CmdArgs.push_back("-gdwarf-2"); - else - CmdArgs.push_back("-g"); diff --git a/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff b/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff new file mode 100644 index 0000000..ab6e21d --- /dev/null +++ b/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff @@ -0,0 +1,20 @@ +This patch makes clang default to DWARF2 debug info format for FreeBSD. + +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 +@@ -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. ++ const llvm::Triple &Triple = getToolChain().getTriple(); ++ if (Triple.isOSDarwin() || Triple.getOS() == llvm::Triple::FreeBSD) + CmdArgs.push_back("-gdwarf-2"); + else + CmdArgs.push_back("-g"); -- cgit v1.1