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/Object/ObjectFile.h | |
| 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/Object/ObjectFile.h')
| -rw-r--r-- | include/llvm/Object/ObjectFile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/llvm/Object/ObjectFile.h b/include/llvm/Object/ObjectFile.h index 41959bd34e..4185ffea13 100644 --- a/include/llvm/Object/ObjectFile.h +++ b/include/llvm/Object/ObjectFile.h @@ -266,7 +266,7 @@ const uint64_t UnknownAddressOrSize = ~0ULL; /// ObjectFile - This class is the base class for all object file types. /// Concrete instances of this object are created by createObjectFile, which -/// figure out which type to create. +/// figures out which type to create. class ObjectFile : public Binary { virtual void anchor(); ObjectFile() LLVM_DELETED_FUNCTION; |