aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/llvm/CodeGen/MachineConstantPool.h8
-rw-r--r--lib/CodeGen/MachineFunction.cpp4
-rw-r--r--lib/Target/ARM/ARMConstantPoolValue.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/include/llvm/CodeGen/MachineConstantPool.h b/include/llvm/CodeGen/MachineConstantPool.h
index acbbc664dc..5ae641fb9e 100644
--- a/include/llvm/CodeGen/MachineConstantPool.h
+++ b/include/llvm/CodeGen/MachineConstantPool.h
@@ -44,7 +44,7 @@ public:
const Type *getType() const { return Ty; }
- /// getRelocatationInfo - This method classifies the entry according to
+ /// getRelocationInfo - This method classifies the entry according to
/// whether or not it may generate a relocation entry. This must be
/// conservative, so if it might codegen to a relocatable entry, it should say
/// so. The return values are:
@@ -55,7 +55,7 @@ public:
/// resolvable by the static linker, so the dynamic linker will never see
/// them.
/// 2: This entry may have arbitrary relocations.
- virtual unsigned getRelocatationInfo() const = 0;
+ virtual unsigned getRelocationInfo() const = 0;
virtual int getExistingMachineCPValue(MachineConstantPool *CP,
unsigned Alignment) = 0;
@@ -109,7 +109,7 @@ public:
const Type *getType() const;
- /// getRelocatationInfo - This method classifies the entry according to
+ /// getRelocationInfo - This method classifies the entry according to
/// whether or not it may generate a relocation entry. This must be
/// conservative, so if it might codegen to a relocatable entry, it should say
/// so. The return values are:
@@ -120,7 +120,7 @@ public:
/// resolvable by the static linker, so the dynamic linker will never see
/// them.
/// 2: This entry may have arbitrary relocations.
- unsigned getRelocatationInfo() const;
+ unsigned getRelocationInfo() const;
};
/// The MachineConstantPool class keeps track of constants referenced by a
diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index e6ae7dc224..682b8a7388 100644
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -544,9 +544,9 @@ const Type *MachineConstantPoolEntry::getType() const {
}
-unsigned MachineConstantPoolEntry::getRelocatationInfo() const {
+unsigned MachineConstantPoolEntry::getRelocationInfo() const {
if (isMachineConstantPoolEntry())
- return Val.MachineCPVal->getRelocatationInfo();
+ return Val.MachineCPVal->getRelocationInfo();
// FIXME: This API sucks.
diff --git a/lib/Target/ARM/ARMConstantPoolValue.h b/lib/Target/ARM/ARMConstantPoolValue.h
index a9308898c8..fcaf2e6885 100644
--- a/lib/Target/ARM/ARMConstantPoolValue.h
+++ b/lib/Target/ARM/ARMConstantPoolValue.h
@@ -65,7 +65,7 @@ public:
bool isStub() const { return Kind == ARMCP::CPStub; }
unsigned char getPCAdjustment() const { return PCAdjust; }
- virtual unsigned getRelocatationInfo() const {
+ virtual unsigned getRelocationInfo() const {
// FIXME: This is conservatively claiming that these entries require a
// relocation, we may be able to do better than this.
return 2;