summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--compiler/llvmGen/LlvmCodeGen/CodeGen.hs2
-rw-r--r--compiler/specialise/Specialise.hs2
-rw-r--r--rts/linker/Elf.c2
-rw-r--r--rts/linker/ElfTypes.h2
-rw-r--r--rts/sm/HeapAlloc.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
index 03813248ae..bf84782537 100644
--- a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
+++ b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
@@ -506,7 +506,7 @@ genCallExtract
:: ForeignTarget -- ^ PrimOp
-> Width -- ^ Width of the operands.
-> (CmmActual, CmmActual) -- ^ Actual arguments.
- -> (LlvmType, LlvmType) -- ^ LLLVM types of the returned sturct.
+ -> (LlvmType, LlvmType) -- ^ LLVM types of the returned struct.
-> LlvmM (LlvmVar, LlvmVar, StmtData)
genCallExtract target@(PrimTarget op) w (argA, argB) (llvmTypeA, llvmTypeB) = do
let width = widthToLlvmInt w
diff --git a/compiler/specialise/Specialise.hs b/compiler/specialise/Specialise.hs
index a1ee94c59e..869da640ea 100644
--- a/compiler/specialise/Specialise.hs
+++ b/compiler/specialise/Specialise.hs
@@ -1854,7 +1854,7 @@ We gather the call info for (f @T $df), and we don't want to drop it
when we come across the binding for $df. So we add $df to the floats
and continue. But then we have to add $c== to the floats, and so on.
These all float above the binding for 'f', and and now we can
-successfullly specialise 'f'.
+successfully specialise 'f'.
So the DictBinds in (ud_binds :: Bag DictBind) may contain
non-dictionary bindings too.
diff --git a/rts/linker/Elf.c b/rts/linker/Elf.c
index 2ae731ba47..e81b97acfa 100644
--- a/rts/linker/Elf.c
+++ b/rts/linker/Elf.c
@@ -1118,7 +1118,7 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC,
case COMPAT_R_ARM_CALL:
case COMPAT_R_ARM_JUMP24:
{
- // N.B. LLVM's LLD linker's relocation implement is a fantastic
+ // N.B. LLVM's LLD linker's relocation implementation is a fantastic
// resource
StgWord32 *word = (StgWord32 *)P;
StgInt32 imm = (*word & ((1<<24)-1)) << 2;
diff --git a/rts/linker/ElfTypes.h b/rts/linker/ElfTypes.h
index 9e2e42f338..852d82a498 100644
--- a/rts/linker/ElfTypes.h
+++ b/rts/linker/ElfTypes.h
@@ -149,7 +149,7 @@ struct _Stub {
void * target;
/* flags can hold architecture specific information they are used during
* lookup of stubs as well. Thus two stubs for the same target with
- * different flags are considerd unequal.
+ * different flags are considered unequal.
*/
uint8_t flags;
struct _Stub * next;
diff --git a/rts/sm/HeapAlloc.h b/rts/sm/HeapAlloc.h
index 197317f6fa..1d9d23758a 100644
--- a/rts/sm/HeapAlloc.h
+++ b/rts/sm/HeapAlloc.h
@@ -132,7 +132,7 @@ extern StgWord8 mblock_map[];
#if defined(x86_64_HOST_ARCH)
// 32bits are enough for 'entry' as modern amd64 boxes have
-// only 48bit sized virtual addres.
+// only 48bit sized virtual address.
typedef StgWord32 MbcCacheLine;
#else
// 32bits is not enough here as some arches (like ia64) use