diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2020-07-17 20:25:12 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2020-07-20 04:30:38 -0400 |
| commit | 868e452340ade3155dd7e552c16bbb3c21c42b8a (patch) | |
| tree | f86f597390e5ec90d41a76229e2d655ac015dad7 | |
| parent | c26e81d116a653b5259aeb290fb1e697efe3382a (diff) | |
| download | haskell-868e452340ade3155dd7e552c16bbb3c21c42b8a.tar.gz | |
Revert "AArch32 symbols only on aarch32."
This reverts commit cdfeb3f24f76e8fd30452016676e56fbc827789a.
Signed-off-by: Moritz Angermann <moritz.angermann@gmail.com>
| -rw-r--r-- | rts/RtsSymbols.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c index 6432cbdcdd..bea9d327aa 100644 --- a/rts/RtsSymbols.c +++ b/rts/RtsSymbols.c @@ -1083,8 +1083,7 @@ /* SymI_NeedsProto(__popcountti2) */ \ /* These functions return the number of bits set in a. */\ SymI_NeedsProto(__bswapsi2) \ - SymI_NeedsProto(__bswapdi2) -#define RTS_LIBGCC_SYMBOLS_aarch32 \ + SymI_NeedsProto(__bswapdi2) \ /* armv6l */\ /* TODO: should check for __ARM_EABI__ */\ SymI_NeedsProto(__aeabi_d2f) \ @@ -1155,12 +1154,12 @@ SymI_NeedsProto(__floatsitf) \ SymI_NeedsProto(__floatunsitf) -#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) +#if 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 |