diff options
author | Ben Gamari <ben@smart-cactus.org> | 2021-07-12 17:26:47 -0400 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-07-27 04:47:51 -0400 |
commit | 2ce48fe9d1334dadf6fa1411238e52d65b66ba41 (patch) | |
tree | 1f48a9e2e2ae3350c3802875bef128327afdf593 /includes | |
parent | 246f08ac032392f808c7aa53dd78a96d9b43e63f (diff) | |
download | haskell-2ce48fe9d1334dadf6fa1411238e52d65b66ba41.tar.gz |
rts: Break up adjustor logic
Diffstat (limited to 'includes')
-rw-r--r-- | includes/ghc.mk | 2 | ||||
-rw-r--r-- | includes/rts/storage/GC.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/includes/ghc.mk b/includes/ghc.mk index 00e518c34d..5e3060c238 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -258,7 +258,7 @@ $(includes_SETTINGS) : includes/Makefile | $$(dir $$@)/. @echo ',("RTS ways", "$(GhcRTSWays)")' >> $@ @echo ',("Tables next to code", "$(TablesNextToCode)")' >> $@ @echo ',("Leading underscore", "$(LeadingUnderscore)")' >> $@ - @echo ',("Use LibFFI", "$(UseLibFFIForAdjustors)")' >> $@ + @echo ',("Use LibFFI", "$(UseLibffiForAdjustors)")' >> $@ @echo ",(\"RTS expects libdw\", \"$(GhcRtsWithLibdw)\")" >> $@ @echo "]" >> $@ diff --git a/includes/rts/storage/GC.h b/includes/rts/storage/GC.h index 0258811728..6f8f382d56 100644 --- a/includes/rts/storage/GC.h +++ b/includes/rts/storage/GC.h @@ -205,9 +205,6 @@ typedef void* AdjustorExecutable; AdjustorWritable allocateExec(W_ len, AdjustorExecutable *exec_addr); void flushExec(W_ len, AdjustorExecutable exec_addr); -#if defined(darwin_HOST_OS) -AdjustorWritable execToWritable(AdjustorExecutable exec); -#endif #if RTS_LINKER_USE_MMAP AdjustorWritable allocateWrite(W_ bytes); void markExec(W_ bytes, AdjustorWritable writ); |