From 949b2ebd167a5d0080f36adf37c8cd52796c9077 Mon Sep 17 00:00:00 2001
From: trav90 <travawine@palemoon.org>
Date: Sat, 23 Jun 2018 19:50:16 -0500
Subject: Remove GCC 4.8 workaround in libopus

This patch removes a workaround when building for ARM platforms using GCC 4.8 (which we no longer support).
---
 media/libopus/celt/rate.c       | 10 ----------
 media/libopus/gcc-4.8-ICE.patch | 39 ---------------------------------------
 media/libopus/update.sh         |  1 -
 3 files changed, 50 deletions(-)
 delete mode 100644 media/libopus/gcc-4.8-ICE.patch

(limited to 'media/libopus')

diff --git a/media/libopus/celt/rate.c b/media/libopus/celt/rate.c
index 29b26c65b..9062ff750 100644
--- a/media/libopus/celt/rate.c
+++ b/media/libopus/celt/rate.c
@@ -524,12 +524,6 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
    return codedBands;
 }
 
-#if !defined(__clang__) && defined(__GNUC__) && defined(__arm__) && \
-    __GNUC__ == 4 && __GNUC_MINOR__ == 8
-#warning "OPUS library causes an internal compiler error for gcc-4.8 based toolchain in arm"
-#pragma GCC push_options
-#pragma GCC optimize ("O0")
-#endif
 int compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo,
       opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth)
 {
@@ -642,7 +636,3 @@ int compute_allocation(const CELTMode *m, int start, int end, const int *offsets
    RESTORE_STACK;
    return codedBands;
 }
-#if !defined(__clang__) && defined(__GNUC__) && defined(__arm__) && \
-    __GNUC__ == 4 && __GNUC_MINOR__ == 8
-#pragma GCC pop_options
-#endif
diff --git a/media/libopus/gcc-4.8-ICE.patch b/media/libopus/gcc-4.8-ICE.patch
deleted file mode 100644
index 92a74e325..000000000
--- a/media/libopus/gcc-4.8-ICE.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 609166a46f6a22ae2d0a0ab7c64415c779c65f37 Mon Sep 17 00:00:00 2001
-From: Juan Gomez <atilag@gmail.com>
-Date: Wed, 26 Nov 2014 23:57:49 +0100
-Subject: [PATCH] Bug 1056337 - Upgrade toolchain used for B2G ICS builds *
- Patch for gcc ICE in OPUS library (arm)
-
----
- media/libopus/celt/rate.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/media/libopus/celt/rate.c b/media/libopus/celt/rate.c
-index e13d839..1055e63 100644
---- a/media/libopus/celt/rate.c
-+++ b/media/libopus/celt/rate.c
-@@ -523,6 +523,12 @@ static OPUS_INLINE int interp_bits2pulses(const CELTMode *m, int start, int end,
-    return codedBands;
- }
- 
-+#if !defined(__clang__) && defined(__GNUC__) && defined(__arm__) && \
-+    __GNUC__ == 4 && __GNUC_MINOR__ == 8
-+#warning "OPUS library causes an internal compiler error for gcc-4.8 based toolchain in arm"
-+#pragma GCC push_options
-+#pragma GCC optimize ("O0")
-+#endif
- int compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stereo,
-       opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int C, int LM, ec_ctx *ec, int encode, int prev, int signalBandwidth)
- {
-@@ -635,4 +641,7 @@ int compute_allocation(const CELTMode *m, int start, int end, const int *offsets
-    RESTORE_STACK;
-    return codedBands;
- }
--
-+#if !defined(__clang__) && defined(__GNUC__) && defined(__arm__) && \
-+    __GNUC__ == 4 && __GNUC_MINOR__ == 8
-+#pragma GCC pop_options
-+#endif
--- 
-2.1.0
-
diff --git a/media/libopus/update.sh b/media/libopus/update.sh
index b36391b05..f7c1120f6 100755
--- a/media/libopus/update.sh
+++ b/media/libopus/update.sh
@@ -74,5 +74,4 @@ sed -e "s/DEFINES\['OPUS_VERSION'\][ \t]*=[ \t]*'\".*\"'/DEFINES['OPUS_VERSION']
 python gen-sources.py $1
 
 # apply outstanding local patches
-patch -p3 < gcc-4.8-ICE.patch
 patch -p3 < nonunified.patch
-- 
cgit v1.2.3