[Git][ghc/ghc][wip/angerman/more-rtsSymbols] AArch32 symbols only on aarch32.

[Moritz Angermann]

Moritz Angermann pushed to branch wip/angerman/more-rtsSymbols at Glasgow Haskell Compiler / GHC


Commits:
c58ea25c by Moritz Angermann at 2020-07-07T10:54:21+08:00
AArch32 symbols only on aarch32.

- - - - -


1 changed file:

- rts/RtsSymbols.c


Changes:

=====================================
rts/RtsSymbols.c
=====================================
@@ -1071,7 +1071,8 @@
       /* SymI_NeedsProto(__popcountti2) */ \
       /* These functions return the number of bits set in a. */\
       SymI_NeedsProto(__bswapsi2) \
-      SymI_NeedsProto(__bswapdi2) \
+      SymI_NeedsProto(__bswapdi2)
+#define RTS_LIBGCC_SYMBOLS_aarch32                     \
       /* armv6l                                      */\
       /* TODO: should check for __ARM_EABI__         */\
       SymI_NeedsProto(__aeabi_d2f) \
@@ -1142,12 +1143,12 @@
       SymI_NeedsProto(__floatsitf)                     \
       SymI_NeedsProto(__floatunsitf)
 
-#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
+#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && defined(arm_HOST_OS)
+#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 RTS_LIBGCC_SYMBOLS_aarch32
+#elif defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
 #define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32
 #elif defined(__GNUC__) && SIZEOF_VOID_P == 8 && defined(aarch64_HOST_OS)
-#define RTS_LIBGCC_SYMBOLS \
-      RTS_LIBGCC_SYMBOLS_64 \
-      RTS_LIBGCC_SYMBOLS_aarch64
+#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 RTS_LIBGCC_SYMBOLS_aarch64
 #elif defined(__GNUC__) && SIZEOF_VOID_P == 8
 #define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64
 #else



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c58ea25c581c8209ed774153d4aa671ef73faf86

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c58ea25c581c8209ed774153d4aa671ef73faf86
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200706/6ada83aa/attachment-0001.html>