diff options
| author | dim <dim@FreeBSD.org> | 2014-04-11 18:40:29 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-04-11 18:40:29 +0000 |
| commit | 9cf177055234a452bf8b42becf69511c6fc54d03 (patch) | |
| tree | d88823ed373518d3c73b01c1fd5ed62d87da8872 /contrib/llvm/patches | |
| parent | 280ce365a6a061992d9eb5fa0ad63bdd23e1d43e (diff) | |
| download | FreeBSD-src-9cf177055234a452bf8b42becf69511c6fc54d03.zip FreeBSD-src-9cf177055234a452bf8b42becf69511c6fc54d03.tar.gz | |
Update the llvm/clang patch for r264345.
Diffstat (limited to 'contrib/llvm/patches')
| -rw-r--r-- | contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff (renamed from contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff) | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff b/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff index 2bbf30c..ab6e21d 100644 --- a/contrib/llvm/patches/patch-r263891-dwarf2-freebsd10.diff +++ b/contrib/llvm/patches/patch-r264345-dwarf2-freebsd10.diff @@ -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"); |
