diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2020-11-13 02:51:54 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-11-15 03:36:56 -0500 |
| commit | 8887102fc4ed8ed1089c1aafd19bab424ad706f3 (patch) | |
| tree | e1c3dfc5d2262efbc6dc6ccb902b288766566d90 /rts/StgCRun.c | |
| parent | 645444af9eb185684c750c95e4740d301352b2b9 (diff) | |
| download | haskell-8887102fc4ed8ed1089c1aafd19bab424ad706f3.tar.gz | |
AArch64/arm64 adjustments
This addes the necessary logic to support aarch64 on elf, as well
as aarch64 on mach-o, which Apple calls arm64.
We change architecture name to AArch64, which is the official arm
naming scheme.
Diffstat (limited to 'rts/StgCRun.c')
| -rw-r--r-- | rts/StgCRun.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rts/StgCRun.c b/rts/StgCRun.c index 31dc9dd42a..536ee45835 100644 --- a/rts/StgCRun.c +++ b/rts/StgCRun.c @@ -932,7 +932,7 @@ StgRun(StgFunPtr f, StgRegTable *basereg) { "br %1\n\t" ".globl " STG_RETURN "\n\t" -#if !defined(ios_HOST_OS) +#if !defined(ios_HOST_OS) && !defined(darwin_HOST_OS) ".type " STG_RETURN ", %%function\n" #endif STG_RETURN ":\n\t" @@ -941,7 +941,7 @@ StgRun(StgFunPtr f, StgRegTable *basereg) { */ "add sp, sp, %3\n\t" /* - * Return the new register table, taking it from Stg's R1 (ARM64's R22). + * Return the new register table, taking it from Stg's R1 (AArch64's R22). */ "mov %0, x22\n\t" /* |