summaryrefslogtreecommitdiff
path: root/rts
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2022-05-12 14:09:17 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-05-30 09:40:55 -0400
commit5878f439d4214ba0dd895e56460f15fc6c67283c (patch)
treee58caba9d0aabbba870f72278511104bbb32873a /rts
parentacc268064daaa39823b0d566169eadb2afdff743 (diff)
downloadhaskell-5878f439d4214ba0dd895e56460f15fc6c67283c.tar.gz
Enable USE_INLINE_SRT_FIELD on ARM64
It was previously disabled because of: - a confusion about "SRT inlining" (see removed comment in this commit) - a linker bug (overflow) in the handling of ARM64_RELOC_SUBTRACTOR relocation: fixed by a previous commit.
Diffstat (limited to 'rts')
-rw-r--r--rts/include/rts/storage/InfoTables.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/rts/include/rts/storage/InfoTables.h b/rts/include/rts/storage/InfoTables.h
index 39423a3f9f..77f45fb533 100644
--- a/rts/include/rts/storage/InfoTables.h
+++ b/rts/include/rts/storage/InfoTables.h
@@ -156,16 +156,12 @@ typedef union {
} StgClosureInfo;
-#if defined(x86_64_HOST_ARCH)
-#define SMALL_MEMORY_MODEL
-#endif
-
// This is where we choose how to represent the SRT location in the info
// table. See the section "Referring to an SRT from the info table" in
// Note [SRTs] in GHC.Cmm.Info.Build.
//
// Specifically we define one of the following:
-#if WORD_SIZE_IN_BITS == 64 && defined(SMALL_MEMORY_MODEL) && defined(TABLES_NEXT_TO_CODE)
+#if WORD_SIZE_IN_BITS == 64 && defined(TABLES_NEXT_TO_CODE)
// On 64-bit platforms using the small memory model we can fit a pointer
// offset in half a word, so put the SRT offset in the info->srt field
// directly.