diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2015-02-02 20:18:47 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2015-02-02 20:18:47 +0000 |
commit | 73ee00cef531927e501f431bba76b48bd9edb661 (patch) | |
tree | ea2cc467314a8ce8270c4ebfdce7e4b5c9363c24 /contrib/llvm | |
parent | 2e5092d9111cfb7f084d564dae8ada16c40a0e5f (diff) | |
parent | b73700f54765da5163dbf953a92a9cfb05a1ac39 (diff) | |
download | src-73ee00cef531927e501f431bba76b48bd9edb661.tar.gz src-73ee00cef531927e501f431bba76b48bd9edb661.zip |
Merge ^/head r278005 through r278109.
Notes
Notes:
svn path=/projects/clang360-import/; revision=278110
Diffstat (limited to 'contrib/llvm')
-rw-r--r-- | contrib/llvm/patches/patch-06-clang-add-mips-triples.diff | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/contrib/llvm/patches/patch-06-clang-add-mips-triples.diff b/contrib/llvm/patches/patch-06-clang-add-mips-triples.diff new file mode 100644 index 000000000000..1173ca849c74 --- /dev/null +++ b/contrib/llvm/patches/patch-06-clang-add-mips-triples.diff @@ -0,0 +1,33 @@ +Allow clang to be built for mips/mips64 backend types by adding our mips +triple ids + +This only allows testing and does not change the defaults for mips/mips64. +They still build/use gcc by default. + +Differential Revision: https://reviews.freebsd.org/D1190 +Reviewed by: dim + +Introduced here: http://svnweb.freebsd.org/changeset/base/277423 + +Index: tools/clang/lib/Driver/Tools.cpp +=================================================================== +--- tools/clang/lib/Driver/Tools.cpp ++++ tools/clang/lib/Driver/Tools.cpp +@@ -6651,6 +6651,17 @@ void freebsd::Link::ConstructJob(Compilation &C, c + CmdArgs.push_back("elf32ppc_fbsd"); + } + ++ if (Arg *A = Args.getLastArg(options::OPT_G)) { ++ if (ToolChain.getArch() == llvm::Triple::mips || ++ ToolChain.getArch() == llvm::Triple::mipsel || ++ ToolChain.getArch() == llvm::Triple::mips64 || ++ ToolChain.getArch() == llvm::Triple::mips64el) { ++ StringRef v = A->getValue(); ++ CmdArgs.push_back(Args.MakeArgString("-G" + v)); ++ A->claim(); ++ } ++ } ++ + if (Output.isFilename()) { + CmdArgs.push_back("-o"); + CmdArgs.push_back(Output.getFilename()); |