diff options
author | dim <dim@FreeBSD.org> | 2015-02-19 22:20:19 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-02-19 22:20:19 +0000 |
commit | 1e024675bcd5e4ace8bffb2dd6afd3fa8b8ad7f3 (patch) | |
tree | 84663adb8262b7962030778aaba745cd98e8b356 /contrib/llvm/patches/patch-06-clang-add-mips-triples.diff | |
parent | 184b3c7999c408b8e298b506ccfdff9d81c9ffd5 (diff) | |
parent | 49b6407b6cc89756540e2097c1cf8b9bb4a422e1 (diff) | |
download | FreeBSD-src-1e024675bcd5e4ace8bffb2dd6afd3fa8b8ad7f3.zip FreeBSD-src-1e024675bcd5e4ace8bffb2dd6afd3fa8b8ad7f3.tar.gz |
Merge llvm 3.6.0rc4 from ^/vendor/llvm/dist, merge clang 3.6.0rc4 from
^/vendor/clang/dist, resolve conflicts, and update patches.
Diffstat (limited to 'contrib/llvm/patches/patch-06-clang-add-mips-triples.diff')
-rw-r--r-- | contrib/llvm/patches/patch-06-clang-add-mips-triples.diff | 2 |
1 files changed, 1 insertions, 1 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 index 1173ca8..2a66949 100644 --- a/contrib/llvm/patches/patch-06-clang-add-mips-triples.diff +++ b/contrib/llvm/patches/patch-06-clang-add-mips-triples.diff @@ -13,7 +13,7 @@ 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 +@@ -6652,6 +6652,17 @@ void freebsd::Link::ConstructJob(Compilation &C, c CmdArgs.push_back("elf32ppc_fbsd"); } |