diff --git a/lib/rbcodec/codecs/libopus/celt/arm/bands_arm.h b/lib/rbcodec/codecs/libopus/celt/arm/bands_arm.h
index 4ff0952aa8..31dd2233af 100644
--- a/lib/rbcodec/codecs/libopus/celt/arm/bands_arm.h
+++ b/lib/rbcodec/codecs/libopus/celt/arm/bands_arm.h
@@ -42,7 +42,7 @@ void denorm_band_armv4(celt_sig *f, const celt_norm *x, int n, int g,
                        int shift);
 #  define DENORM_BAND denorm_band_armv4
 
-# elif defined(OPUS_ARM_INLINE_EDSP) && (ARM_ARCH == 5)
+# elif defined(OPUS_ARM_INLINE_EDSP) && (ARM_ARCH >= 5)
 
 #  define OVERRIDE_DENORM_BAND
 void denorm_band_armv5e(celt_sig *f, const celt_norm *x, int n, int g,
diff --git a/lib/rbcodec/codecs/libopus/celt/arm/comb_filter_arm.h b/lib/rbcodec/codecs/libopus/celt/arm/comb_filter_arm.h
index a1f1baaecf..67a0559047 100644
--- a/lib/rbcodec/codecs/libopus/celt/arm/comb_filter_arm.h
+++ b/lib/rbcodec/codecs/libopus/celt/arm/comb_filter_arm.h
@@ -61,7 +61,7 @@ void deemph_stereo_armv4(celt_sig *x0, celt_sig *x1, opus_val16 *pcm, int N,
 #  define deemphasis_stereo_simple(in, pcm, N, coef0, mem) \
      deemph_stereo_armv4((in)[0], (in)[1], (pcm), (N), (coef0), (mem))
 
-# elif defined(OPUS_ARM_INLINE_EDSP) && (ARM_ARCH == 5)
+# elif defined(OPUS_ARM_INLINE_EDSP) && (ARM_ARCH >= 5)
 
 #  define OVERRIDE_COMB_FILTER_CONST
 void comb_filter_const_armv5e(opus_val32 *y, opus_val32 *x, int T, int N,
diff --git a/lib/rbcodec/codecs/libopus/celt/arm/vq_arm.h b/lib/rbcodec/codecs/libopus/celt/arm/vq_arm.h
index a68b9946ec..6b725a3a47 100644
--- a/lib/rbcodec/codecs/libopus/celt/arm/vq_arm.h
+++ b/lib/rbcodec/codecs/libopus/celt/arm/vq_arm.h
@@ -36,7 +36,7 @@
    Shares OPUS_ARM_NO_BANDS_ASM with arm/bands_arm.h as the escape hatch. */
 
 #if defined(FIXED_POINT) && !defined(OPUS_ARM_NO_BANDS_ASM) \
- && defined(OPUS_ARM_INLINE_EDSP) && (ARM_ARCH == 5)
+ && defined(OPUS_ARM_INLINE_EDSP) && (ARM_ARCH >= 5)
 
 #define OVERRIDE_vq_exp_rotation1
 void exp_rotation1_armv5e(celt_norm *X, int len, int stride, opus_val16 c,
diff --git a/lib/rbcodec/codecs/libopus/config.h b/lib/rbcodec/codecs/libopus/config.h
index d1d37e042e..3b57bc4221 100644
--- a/lib/rbcodec/codecs/libopus/config.h
+++ b/lib/rbcodec/codecs/libopus/config.h
@@ -87,6 +87,8 @@
 #define OPUS_ARM_NO_MDCT_ASM
 #define OPUS_ARM_NO_PITCH_ASM
 #define OPUS_NO_PFA
+#define OPUS_ARM_NO_COMB_ASM
+#define OPUS_ARM_NO_BANDS_ASM
 #endif
 #endif /* ARM_ARCH */