diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-12 16:24:16 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-12 16:24:16 -0700 |
| commit | 5eceb0e04023bffa93f5683f356c09e35f9f4f43 (patch) | |
| tree | 07d52d1eaf89a4b4544b48322dcdbc4f65b102d4 | |
| parent | 4db6bb7837c58641c4416e87643833bca4945841 (diff) | |
| parent | 40573998821fde7ffeabe8507f4c9e8c7cf762f6 (diff) | |
Merge commit '40573998821fde7ffeabe8507f4c9e8c7cf762f6'
Conflicts:
include/llvm/MC/MCAssembler.h
lib/Target/ARM/ARMISelLowering.cpp
lib/Target/X86/X86TargetMachine.h
tools/llc/llc.cpp