diff options
author | JMadgwick <james.madgwick@outlook.com> | 2020-03-05 21:03:44 +0000 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 13:18:48 +0200 |
commit | 64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53 (patch) | |
tree | bb1ec37d987918be07f551b956ba3887c1c7d523 /media | |
parent | 514ff21cbab5c638d9c347ed261a14e8bd5295e6 (diff) | |
download | UXP-64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53.tar UXP-64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53.tar.gz UXP-64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53.tar.lz UXP-64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53.tar.xz UXP-64a7c9e2d2f8c9ebdc4c70c16c630cebbd5abe53.zip |
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 55ed38c2c..8966586a7 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 99ea82a99..fa669b886 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 |