diff options
| author | dim <dim@FreeBSD.org> | 2014-11-24 17:02:24 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-11-24 17:02:24 +0000 |
| commit | 2c8643c6396b0a3db33430cf9380e70bbb9efce0 (patch) | |
| tree | 4df130b28021d86e13bf4565ef58c1c5a5e093b4 /contrib/llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp | |
| parent | 678318cd20f7db4e6c6b85d83fe00fa327b04fca (diff) | |
| parent | e27feadae0885aa074df58ebfda2e7a7f7a7d590 (diff) | |
| download | FreeBSD-src-2c8643c6396b0a3db33430cf9380e70bbb9efce0.zip FreeBSD-src-2c8643c6396b0a3db33430cf9380e70bbb9efce0.tar.gz | |
Merge llvm 3.5.0 release from ^/vendor/llvm/dist, resolve conflicts, and
preserve our customizations, where necessary.
Diffstat (limited to 'contrib/llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp')
| -rw-r--r-- | contrib/llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp b/contrib/llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp index 815d235..1ea8798 100644 --- a/contrib/llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp +++ b/contrib/llvm/lib/Target/X86/TargetInfo/X86TargetInfo.cpp @@ -7,8 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "X86.h" -#include "llvm/IR/Module.h" +#include "MCTargetDesc/X86MCTargetDesc.h" #include "llvm/Support/TargetRegistry.h" using namespace llvm; |
