summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2021-03-24 10:07:02 +0800
committerMoritz Angermann <moritz.angermann@gmail.com>2021-03-30 00:48:06 -0400
commit561e34e7b86382603b53b666ae863e35402e1a81 (patch)
tree877f91a012a0a3cc264ce402a6a7619c68c561b2
parentd7b97bccebba860a04ad4dcd6a063a4e802aa2f4 (diff)
downloadhaskell-561e34e7b86382603b53b666ae863e35402e1a81.tar.gz
[linker] SymbolExtras are only used on PPC and X86
(cherry picked from commit eda8758fdee30f22f4e90b31a085b228f55892e4)
-rw-r--r--rts/linker/SymbolExtras.c4
-rw-r--r--rts/linker/SymbolExtras.h5
2 files changed, 4 insertions, 5 deletions
diff --git a/rts/linker/SymbolExtras.c b/rts/linker/SymbolExtras.c
index 7df5d7d3d6..f5147f8036 100644
--- a/rts/linker/SymbolExtras.c
+++ b/rts/linker/SymbolExtras.c
@@ -152,7 +152,7 @@ void ocProtectExtras(ObjectCode* oc)
}
-#if !defined(arm_HOST_ARCH)
+#if defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
SymbolExtra* makeSymbolExtra( ObjectCode const* oc,
unsigned long symbolNumber,
unsigned long target )
@@ -189,6 +189,6 @@ SymbolExtra* makeSymbolExtra( ObjectCode const* oc,
return extra;
}
-#endif /* !arm_HOST_ARCH */
+#endif /* powerpc_HOST_ARCH || x86_64_HOST_ARCH */
#endif /* !x86_64_HOST_ARCH) || !mingw32_HOST_OS */
#endif // NEED_SYMBOL_EXTRAS
diff --git a/rts/linker/SymbolExtras.h b/rts/linker/SymbolExtras.h
index 6c05020b7b..9573856f87 100644
--- a/rts/linker/SymbolExtras.h
+++ b/rts/linker/SymbolExtras.h
@@ -16,13 +16,12 @@ SymbolExtra* makeArmSymbolExtra( ObjectCode const* oc,
unsigned long target,
bool fromThumb,
bool toThumb );
-#else
+#elif defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
SymbolExtra* makeSymbolExtra( ObjectCode const* oc,
unsigned long symbolNumber,
unsigned long target );
-#endif /* arm_HOST_ARCH */
-
+#endif /* powerpc_HOST_ARCH || x86_64_HOST_ARCH */
#endif /* NEED_SYMBOL_EXTRAS */
#include "EndPrivate.h"