https://github.com/MLton/mlton/commit/c611cbbf9a88eeb86bec51e079ecbfe3c2cb3096 Rebased for 20130715 release. diff --git a/lib/stubs/mlton-stubs/mlton.sml b/lib/stubs/mlton-stubs/mlton.sml index f494ff2..602806a 100644 --- a/lib/stubs/mlton-stubs/mlton.sml +++ b/lib/stubs/mlton-stubs/mlton.sml @@ -158,12 +158,13 @@ structure MLton: MLTON = structure Arch = struct - datatype t = Alpha | AMD64 | ARM | HPPA | IA64 | m68k | + datatype t = Alpha | AMD64 | ARM | ARM64 | HPPA | IA64 | m68k | MIPS | PowerPC | PowerPC64 | S390 | Sparc | X86 val all = [(Alpha, "Alpha"), (AMD64, "AMD64"), (ARM, "ARM"), + (ARM64, "ARM64"), (HPPA, "HPPA"), (IA64, "IA64"), (m68k, "m68k"), diff --git a/lib/stubs/mlton-stubs/platform.sig b/lib/stubs/mlton-stubs/platform.sig index 507a8dd..f962656 100644 --- a/lib/stubs/mlton-stubs/platform.sig +++ b/lib/stubs/mlton-stubs/platform.sig @@ -9,7 +9,7 @@ signature MLTON_PLATFORM = sig structure Arch: sig - datatype t = Alpha | AMD64 | ARM | HPPA | IA64 | m68k | + datatype t = Alpha | AMD64 | ARM | ARM64 | HPPA | IA64 | m68k | MIPS | PowerPC | PowerPC64 | S390 | Sparc | X86 val fromString: string -> t option diff --git a/mlton/main/main.fun b/mlton/main/main.fun index 73ba50f..8af8cee 100644 --- a/mlton/main/main.fun +++ b/mlton/main/main.fun @@ -187,6 +187,7 @@ fun defaultAlignIs8 () = Alpha => true | AMD64 => true | ARM => true + | ARM64 => true | HPPA => true | IA64 => true | MIPS => true diff --git a/runtime/platform/arm64.h b/runtime/platform/arm64.h new file mode 100644 index 0000000..d056da7 --- /dev/null +++ b/runtime/platform/arm64.h @@ -0,0 +1 @@ +#define MLton_Platform_Arch_host "arm64"