6 files changed, 11 insertions, 0 deletions

diff --git a/lib/arm_support/support-arm.S b/lib/arm_support/support-arm.S
index 3af0c70975..d12392eeb3 100644
--- a/lib/arm_support/support-arm.S
+++ b/lib/arm_support/support-arm.S
@@ -30,6 +30,8 @@
 
 #include <config.h>
 
+.syntax unified
+
 .macro ARM_SDIV32_PRE numerator, divisor, sign
     /* sign[31] = divisor sign */
     ands    \sign, \divisor, #1<<31
diff --git a/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S
index 1d19160a91..514bae2949 100644
--- a/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S
+++ b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S
@@ -29,6 +29,9 @@
  ****************************************************************************/
 
 #include "config.h"
+
+.syntax unified
+
 /* On targets with codec iram, a header file will be generated after an initial
    link of the APE codec, stating the amount of IRAM remaining for use by the
    reciprocal lookup table. */
diff --git a/lib/rbcodec/codecs/libtta/filter_arm.S b/lib/rbcodec/codecs/libtta/filter_arm.S
index 10f1491796..d801a52419 100644
--- a/lib/rbcodec/codecs/libtta/filter_arm.S
+++ b/lib/rbcodec/codecs/libtta/filter_arm.S
@@ -26,6 +26,8 @@
  * void hybrid_filter(fltst *fs, int *in)
  */
 
+    .syntax unified
+
 #ifdef USE_IRAM
     .section .icode, "ax", %progbits
 #else
diff --git a/lib/rbcodec/dsp/dsp_arm.S b/lib/rbcodec/dsp/dsp_arm.S
index 864abee4b6..b17c94fe6c 100644
--- a/lib/rbcodec/dsp/dsp_arm.S
+++ b/lib/rbcodec/dsp/dsp_arm.S
@@ -22,6 +22,7 @@
  ****************************************************************************/
  #include "rbcodecconfig.h"
 
+    .syntax unified
 /****************************************************************************
  *  void channel_mode_proc_mono(struct dsp_proc_entry *this,
  *                              struct dsp_buffer **buf_p)
diff --git a/lib/rbcodec/dsp/dsp_arm_v6.S b/lib/rbcodec/dsp/dsp_arm_v6.S
index aa27ec90f6..facd3facbd 100644
--- a/lib/rbcodec/dsp/dsp_arm_v6.S
+++ b/lib/rbcodec/dsp/dsp_arm_v6.S
@@ -20,6 +20,7 @@
  ****************************************************************************/
  #include "rbcodecconfig.h"
 
+ .syntax unified
 /****************************************************************************
  *  void sample_output_mono(struct sample_io_data *this,
  *                          struct dsp_buffer *src,
diff --git a/lib/unwarminder/safe_read.S b/lib/unwarminder/safe_read.S
index ce4913870c..557f3dca31 100644
--- a/lib/unwarminder/safe_read.S
+++ b/lib/unwarminder/safe_read.S
@@ -20,6 +20,8 @@
  ****************************************************************************/
 #include "config.h"
 
+.syntax unified
+
 .data
 was_aborted:
     .word   0