diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-23 11:45:20 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-23 11:45:34 -0700 |
| commit | 4ce160aa277821da7b43fb457672a625facbad12 (patch) | |
| tree | 9bf076476a3a8f6cca98264333e98001b9c64a95 /include/llvm-c | |
| parent | f31db0fd81a8fdfb5c0c6792be6682074a66fe6b (diff) | |
| parent | 92b0d8cf2c51debc7f4fb30a417ae839077a8ed0 (diff) | |
Merge commit '92b0d8cf2c51debc7f4fb30a417ae839077a8ed0'
Conflicts:
lib/Target/ARM/ARMISelLowering.cpp
lib/Target/Mips/MipsISelLowering.h
lib/Target/X86/X86ISelLowering.h
lib/Target/X86/X86TargetMachine.h
tools/llc/llc.cpp
The only interesting conflict was ARMISelLowering, caused by
http://llvm.org/viewvc/llvm-project?view=rev&revision=166273
which actually removes a LOCALMOD for ARM byval lowering.
Diffstat (limited to 'include/llvm-c')
| -rw-r--r-- | include/llvm-c/Disassembler.h | 9 | ||||
| -rw-r--r-- | include/llvm-c/Transforms/Vectorize.h | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/llvm-c/Disassembler.h b/include/llvm-c/Disassembler.h index 69fdc64566..b8c4ad9ad7 100644 --- a/include/llvm-c/Disassembler.h +++ b/include/llvm-c/Disassembler.h @@ -146,6 +146,15 @@ LLVMDisasmContextRef LLVMCreateDisasm(const char *TripleName, void *DisInfo, LLVMSymbolLookupCallback SymbolLookUp); /** + * Set the disassembler's options. Returns 1 if it can set the Options and 0 + * otherwise. + */ +int LLVMSetDisasmOptions(LLVMDisasmContextRef DC, uint64_t Options); + +/* The option to produce marked up assembly. */ +#define LLVMDisassembler_Option_UseMarkup 1 + +/** * Dispose of a disassembler context. */ void LLVMDisasmDispose(LLVMDisasmContextRef DC); diff --git a/include/llvm-c/Transforms/Vectorize.h b/include/llvm-c/Transforms/Vectorize.h index 9e7c7540d7..68a9bdd388 100644 --- a/include/llvm-c/Transforms/Vectorize.h +++ b/include/llvm-c/Transforms/Vectorize.h @@ -36,6 +36,9 @@ extern "C" { /** See llvm::createBBVectorizePass function. */ void LLVMAddBBVectorizePass(LLVMPassManagerRef PM); +/** See llvm::createLoopVectorizePass function. */ +void LLVMAddLoopVectorizePass(LLVMPassManagerRef PM); + /** * @} */ |