3 files changed, 3 insertions, 1 deletions

diff --git a/apps/codecs/lib/SOURCES b/apps/codecs/lib/SOURCES
index ffbe1af92e..a8c3feb1aa 100644
--- a/apps/codecs/lib/SOURCES
+++ b/apps/codecs/lib/SOURCES
@@ -8,6 +8,7 @@ mdct_lookup.c
 mdct_arm.S
 setjmp_arm.S
 udiv32_arm.S
+../../../firmware/target/arm/support-arm.S
 #endif
 
 #ifdef CPU_COLDFIRE
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h
index 926035f05e..2d34523de5 100644
--- a/apps/codecs/lib/codeclib.h
+++ b/apps/codecs/lib/codeclib.h
@@ -65,7 +65,7 @@ void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, con
 
 extern void mdct_backward(int n, int32_t *in, int32_t *out);
 
-#ifdef CPU_ARM
+#if defined(CPU_ARM) && (ARM_ARCH < 5 || defined(USE_IRAM))
 /* optimised unsigned integer division for ARMv4, in IRAM */
 unsigned udiv32_arm(unsigned a, unsigned b);
 #define UDIV32(a, b) udiv32_arm(a, b)
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES
index 00d3ac7c56..82807d15ee 100644
--- a/apps/plugins/lib/SOURCES
+++ b/apps/plugins/lib/SOURCES
@@ -30,6 +30,7 @@ profile_plugin.c
 #endif
 #ifdef HAVE_LCD_BITMAP
 #ifdef CPU_ARM
+../../../firmware/target/arm/support-arm.S
 pluginlib_jpeg_idct_arm.S
 #endif
 pluginlib_jpeg_mem.c