diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2014-11-24 17:02:24 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2014-11-24 17:02:24 +0000 |
| commit | 91bc56ed825ba56b3cc264aa5c95ab84f86832ab (patch) | |
| tree | 4df130b28021d86e13bf4565ef58c1c5a5e093b4 /contrib/llvm/lib/IR/GVMaterializer.cpp | |
| parent | 9efc7e72bb1daf5d6019871d9c93a1c488a11229 (diff) | |
| parent | 5ca98fd98791947eba83a1ed3f2c8191ef7afa6c (diff) | |
Merge llvm 3.5.0 release from ^/vendor/llvm/dist, resolve conflicts, and
preserve our customizations, where necessary.
Notes
Notes:
svn path=/projects/clang350-import/; revision=274968
Diffstat (limited to 'contrib/llvm/lib/IR/GVMaterializer.cpp')
| -rw-r--r-- | contrib/llvm/lib/IR/GVMaterializer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/lib/IR/GVMaterializer.cpp b/contrib/llvm/lib/IR/GVMaterializer.cpp index f77a9c908d54..706926d1b981 100644 --- a/contrib/llvm/lib/IR/GVMaterializer.cpp +++ b/contrib/llvm/lib/IR/GVMaterializer.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/GVMaterializer.h" +#include "llvm/IR/GVMaterializer.h" using namespace llvm; GVMaterializer::~GVMaterializer() {} |