From 8c86fb6da0b9c068ee4b4220dee11171e322f67f Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Wed, 24 May 2023 09:37:20 -0400 Subject: arm: Use -masm-syntax-unified when compiling with gcc8 or newer Annoyingly, this makes all of the '.S' files we compile get treated as divided syntax, so we need to make the syntax in them explicit. Change-Id: I56a3916b7b24c84a1214a5d6bc4ed4d651f002cf --- lib/arm_support/support-arm.S | 2 ++ lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S | 3 +++ lib/rbcodec/codecs/libtta/filter_arm.S | 2 ++ lib/rbcodec/dsp/dsp_arm.S | 1 + lib/rbcodec/dsp/dsp_arm_v6.S | 1 + lib/unwarminder/safe_read.S | 2 ++ 6 files changed, 11 insertions(+) (limited to 'lib') 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 +.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 -- cgit v1.2.3