diff options
| author | JMadgwick <james.madgwick@outlook.com> | 2020-03-05 21:03:44 +0000 |
|---|---|---|
| committer | JMadgwick <james.madgwick@outlook.com> | 2020-03-09 20:55:13 +0000 |
| commit | f7c9359b2ac431ac99fb4e8a1ebd799e6e8fb21c (patch) | |
| tree | 8af67b167fb752ce55ec4a15c46162d8c069b5c7 /media | |
| parent | 88da01c294175f81091e1499374415404e27a57a (diff) | |
| download | uxp-f7c9359b2ac431ac99fb4e8a1ebd799e6e8fb21c.tar.gz | |
Issue #1471 - Fix building on sparc64 Linux
Correct various pre-processor defines for sparc64 and in mozjemalloc use the JS arm64 allocator on Linux/sparc64.
This corrects build problems opn Linux sparc64 and is in line with bugzilla bug #1275204.
Diffstat (limited to 'media')
| -rw-r--r-- | media/webrtc/trunk/build/build_config.h | 2 | ||||
| -rw-r--r-- | media/webrtc/trunk/webrtc/typedefs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/webrtc/trunk/build/build_config.h b/media/webrtc/trunk/build/build_config.h index 55ed38c2c4..8966586a7a 100644 --- a/media/webrtc/trunk/build/build_config.h +++ b/media/webrtc/trunk/build/build_config.h @@ -129,7 +129,7 @@ #define ARCH_CPU_PPC 1 #define ARCH_CPU_32_BITS 1 #define ARCH_CPU_BIG_ENDIAN 1 -#elif defined(__sparc64__) +#elif defined(__sparc__) && defined(__arch64__) #define ARCH_CPU_SPARC_FAMILY 1 #define ARCH_CPU_SPARC 1 #define ARCH_CPU_64_BITS 1 diff --git a/media/webrtc/trunk/webrtc/typedefs.h b/media/webrtc/trunk/webrtc/typedefs.h index 99ea82a994..fa669b8864 100644 --- a/media/webrtc/trunk/webrtc/typedefs.h +++ b/media/webrtc/trunk/webrtc/typedefs.h @@ -61,7 +61,7 @@ #define WEBRTC_ARCH_BIG_ENDIAN #define WEBRTC_BIG_ENDIAN #endif -#elif defined(__sparc64__) +#elif defined(__sparc__) && defined(__arch64__) #define WEBRTC_ARCH_SPARC 1 #define WEBRTC_ARCH_64_BITS 1 #define WEBRTC_ARCH_BIG_ENDIAN |