diff --git a/codec/common/arm/arm_arch_common_macro.S b/codec/common/arm/arm_arch_common_macro.S
index b278c419..f72b7c99 100644
--- a/codec/common/arm/arm_arch_common_macro.S
+++ b/codec/common/arm/arm_arch_common_macro.S
@@ -36,6 +36,8 @@
 
 #ifdef __APPLE__
 
+.text
+
 .macro WELS_ASM_FUNC_BEGIN
 .align 2
 .arm
diff --git a/codec/common/arm/copy_mb_neon.S b/codec/common/arm/copy_mb_neon.S
index c565a9ee..4062658d 100644
--- a/codec/common/arm/copy_mb_neon.S
+++ b/codec/common/arm/copy_mb_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 #ifdef __APPLE__
diff --git a/codec/common/arm/deblocking_neon.S b/codec/common/arm/deblocking_neon.S
index e335134c..c23605ff 100644
--- a/codec/common/arm/deblocking_neon.S
+++ b/codec/common/arm/deblocking_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON
-.text
 
 #include "arm_arch_common_macro.S"
 
diff --git a/codec/common/arm/expand_picture_neon.S b/codec/common/arm/expand_picture_neon.S
index ebb9f579..5dc403da 100644
--- a/codec/common/arm/expand_picture_neon.S
+++ b/codec/common/arm/expand_picture_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 
diff --git a/codec/common/arm/intra_pred_common_neon.S b/codec/common/arm/intra_pred_common_neon.S
index c730520e..18b12378 100644
--- a/codec/common/arm/intra_pred_common_neon.S
+++ b/codec/common/arm/intra_pred_common_neon.S
@@ -32,7 +32,6 @@
 
 
 #ifdef  HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 WELS_ASM_FUNC_BEGIN WelsI16x16LumaPredV_neon
diff --git a/codec/common/arm/mc_neon.S b/codec/common/arm/mc_neon.S
index 702069b9..41c15da1 100644
--- a/codec/common/arm/mc_neon.S
+++ b/codec/common/arm/mc_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 #ifdef __APPLE__
diff --git a/codec/common/arm64/arm_arch64_common_macro.S b/codec/common/arm64/arm_arch64_common_macro.S
index eac7f9a4..af635da1 100644
--- a/codec/common/arm64/arm_arch64_common_macro.S
+++ b/codec/common/arm64/arm_arch64_common_macro.S
@@ -32,6 +32,8 @@
 
 #ifdef __APPLE__
 
+.text
+
 .macro WELS_ASM_AARCH64_FUNC_BEGIN
 .align 2
 .globl _$0
diff --git a/codec/common/arm64/copy_mb_aarch64_neon.S b/codec/common/arm64/copy_mb_aarch64_neon.S
index 5304e54f..ea86c9be 100644
--- a/codec/common/arm64/copy_mb_aarch64_neon.S
+++ b/codec/common/arm64/copy_mb_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 #ifdef __APPLE__
diff --git a/codec/common/arm64/deblocking_aarch64_neon.S b/codec/common/arm64/deblocking_aarch64_neon.S
index 4478eb4d..76f3612a 100644
--- a/codec/common/arm64/deblocking_aarch64_neon.S
+++ b/codec/common/arm64/deblocking_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 
 #include "arm_arch64_common_macro.S"
 #ifdef __APPLE__
diff --git a/codec/common/arm64/expand_picture_aarch64_neon.S b/codec/common/arm64/expand_picture_aarch64_neon.S
index 3c06061b..f447f485 100644
--- a/codec/common/arm64/expand_picture_aarch64_neon.S
+++ b/codec/common/arm64/expand_picture_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 WELS_ASM_AARCH64_FUNC_BEGIN ExpandPictureLuma_AArch64_neon
diff --git a/codec/common/arm64/intra_pred_common_aarch64_neon.S b/codec/common/arm64/intra_pred_common_aarch64_neon.S
index 7568e0cb..a4abff48 100644
--- a/codec/common/arm64/intra_pred_common_aarch64_neon.S
+++ b/codec/common/arm64/intra_pred_common_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 //for Luma 16x16
diff --git a/codec/common/arm64/mc_aarch64_neon.S b/codec/common/arm64/mc_aarch64_neon.S
index 80ebc260..caa8eb3a 100644
--- a/codec/common/arm64/mc_aarch64_neon.S
+++ b/codec/common/arm64/mc_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 .align 4
 filter_para: .short 0, 1, -5, 20, 0, 0, 0, 0
diff --git a/codec/decoder/core/arm/block_add_neon.S b/codec/decoder/core/arm/block_add_neon.S
index 820cd450..844af48c 100644
--- a/codec/decoder/core/arm/block_add_neon.S
+++ b/codec/decoder/core/arm/block_add_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 #ifdef __APPLE__
 
diff --git a/codec/decoder/core/arm/intra_pred_neon.S b/codec/decoder/core/arm/intra_pred_neon.S
index ec2e0672..1860ee42 100644
--- a/codec/decoder/core/arm/intra_pred_neon.S
+++ b/codec/decoder/core/arm/intra_pred_neon.S
@@ -32,7 +32,6 @@
 
 #ifdef  HAVE_NEON
 //Global macro
-.text
 #include "arm_arch_common_macro.S"
 
 #ifdef __APPLE__
diff --git a/codec/decoder/core/arm64/block_add_aarch64_neon.S b/codec/decoder/core/arm64/block_add_aarch64_neon.S
index 26f44dc6..944d5f25 100644
--- a/codec/decoder/core/arm64/block_add_aarch64_neon.S
+++ b/codec/decoder/core/arm64/block_add_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 #ifdef __APPLE__
 .macro ROW_TRANSFORM_1_STEP
diff --git a/codec/decoder/core/arm64/intra_pred_aarch64_neon.S b/codec/decoder/core/arm64/intra_pred_aarch64_neon.S
index 63c85864..f8f9e03c 100644
--- a/codec/decoder/core/arm64/intra_pred_aarch64_neon.S
+++ b/codec/decoder/core/arm64/intra_pred_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 // for Luma 4x4
diff --git a/codec/encoder/core/arm/intra_pred_neon.S b/codec/encoder/core/arm/intra_pred_neon.S
index ca2475ad..ecd5cd5c 100644
--- a/codec/encoder/core/arm/intra_pred_neon.S
+++ b/codec/encoder/core/arm/intra_pred_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON
-.text
 
 #include "arm_arch_common_macro.S"
 
diff --git a/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S b/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S
index 8a0215e8..f6c70825 100644
--- a/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S
+++ b/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 
diff --git a/codec/encoder/core/arm/memory_neon.S b/codec/encoder/core/arm/memory_neon.S
index 1a0bb784..88957dc2 100644
--- a/codec/encoder/core/arm/memory_neon.S
+++ b/codec/encoder/core/arm/memory_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 
diff --git a/codec/encoder/core/arm/pixel_neon.S b/codec/encoder/core/arm/pixel_neon.S
index c21c3e13..1a93d6c2 100644
--- a/codec/encoder/core/arm/pixel_neon.S
+++ b/codec/encoder/core/arm/pixel_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 .macro SATD_16x4
diff --git a/codec/encoder/core/arm/reconstruct_neon.S b/codec/encoder/core/arm/reconstruct_neon.S
index b36844ba..2eb94b78 100644
--- a/codec/encoder/core/arm/reconstruct_neon.S
+++ b/codec/encoder/core/arm/reconstruct_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 #ifdef __APPLE__
diff --git a/codec/encoder/core/arm/svc_motion_estimation.S b/codec/encoder/core/arm/svc_motion_estimation.S
index 906db7b9..716b183f 100644
--- a/codec/encoder/core/arm/svc_motion_estimation.S
+++ b/codec/encoder/core/arm/svc_motion_estimation.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 
diff --git a/codec/encoder/core/arm64/intra_pred_aarch64_neon.S b/codec/encoder/core/arm64/intra_pred_aarch64_neon.S
index ba8ddd95..4b4eb057 100644
--- a/codec/encoder/core/arm64/intra_pred_aarch64_neon.S
+++ b/codec/encoder/core/arm64/intra_pred_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 // for Luma 4x4
diff --git a/codec/encoder/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S b/codec/encoder/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S
index f4ef72ba..490b8b5a 100644
--- a/codec/encoder/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S
+++ b/codec/encoder/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 .macro LOAD_LUMA_DATA
diff --git a/codec/encoder/core/arm64/memory_aarch64_neon.S b/codec/encoder/core/arm64/memory_aarch64_neon.S
index fea2d5c1..b5dcb223 100644
--- a/codec/encoder/core/arm64/memory_aarch64_neon.S
+++ b/codec/encoder/core/arm64/memory_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 
diff --git a/codec/encoder/core/arm64/pixel_aarch64_neon.S b/codec/encoder/core/arm64/pixel_aarch64_neon.S
index 8b2fbcd9..1de5b10e 100644
--- a/codec/encoder/core/arm64/pixel_aarch64_neon.S
+++ b/codec/encoder/core/arm64/pixel_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 .macro CALC_AND_STORE_SAD
diff --git a/codec/encoder/core/arm64/reconstruct_aarch64_neon.S b/codec/encoder/core/arm64/reconstruct_aarch64_neon.S
index b93d9727..09e93a48 100644
--- a/codec/encoder/core/arm64/reconstruct_aarch64_neon.S
+++ b/codec/encoder/core/arm64/reconstruct_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 #ifdef __APPLE__
diff --git a/codec/encoder/core/arm64/svc_motion_estimation_aarch64_neon.S b/codec/encoder/core/arm64/svc_motion_estimation_aarch64_neon.S
index 4bee16b3..f67b5572 100644
--- a/codec/encoder/core/arm64/svc_motion_estimation_aarch64_neon.S
+++ b/codec/encoder/core/arm64/svc_motion_estimation_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 WELS_ASM_AARCH64_FUNC_BEGIN SumOf8x8SingleBlock_AArch64_neon
@@ -334,4 +333,4 @@ _hash_width_loop:
     subs x2, x2, #1
     cbnz x2, _hash_height_loop
 WELS_ASM_AARCH64_FUNC_END
-#endif
\ No newline at end of file
+#endif
diff --git a/codec/processing/src/arm/adaptive_quantization.S b/codec/processing/src/arm/adaptive_quantization.S
index 70091062..88d5a2eb 100644
--- a/codec/processing/src/arm/adaptive_quantization.S
+++ b/codec/processing/src/arm/adaptive_quantization.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 #ifdef __APPLE__
diff --git a/codec/processing/src/arm/down_sample_neon.S b/codec/processing/src/arm/down_sample_neon.S
index da7aca56..334e6491 100644
--- a/codec/processing/src/arm/down_sample_neon.S
+++ b/codec/processing/src/arm/down_sample_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef  HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 
diff --git a/codec/processing/src/arm/pixel_sad_neon.S b/codec/processing/src/arm/pixel_sad_neon.S
index da0190ed..b1fc4fa3 100644
--- a/codec/processing/src/arm/pixel_sad_neon.S
+++ b/codec/processing/src/arm/pixel_sad_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 
diff --git a/codec/processing/src/arm/vaa_calc_neon.S b/codec/processing/src/arm/vaa_calc_neon.S
index 73d3708f..002147da 100644
--- a/codec/processing/src/arm/vaa_calc_neon.S
+++ b/codec/processing/src/arm/vaa_calc_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON
-.text
 #include "arm_arch_common_macro.S"
 
 #ifdef __APPLE__
diff --git a/codec/processing/src/arm64/adaptive_quantization_aarch64_neon.S b/codec/processing/src/arm64/adaptive_quantization_aarch64_neon.S
index 42711a10..fc486020 100644
--- a/codec/processing/src/arm64/adaptive_quantization_aarch64_neon.S
+++ b/codec/processing/src/arm64/adaptive_quantization_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 WELS_ASM_AARCH64_FUNC_BEGIN SampleVariance16x16_AArch64_neon
     ld1   {v1.16b}, [x0], x1 //save the ref data (16bytes)
diff --git a/codec/processing/src/arm64/down_sample_aarch64_neon.S b/codec/processing/src/arm64/down_sample_aarch64_neon.S
index 12502f9d..ed509965 100644
--- a/codec/processing/src/arm64/down_sample_aarch64_neon.S
+++ b/codec/processing/src/arm64/down_sample_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 WELS_ASM_AARCH64_FUNC_BEGIN DyadicBilinearDownsampler_AArch64_neon
@@ -223,4 +222,4 @@ _LAST_ROW_WIDTH:
 
 WELS_ASM_AARCH64_FUNC_END
 
-#endif
\ No newline at end of file
+#endif
diff --git a/codec/processing/src/arm64/pixel_sad_aarch64_neon.S b/codec/processing/src/arm64/pixel_sad_aarch64_neon.S
index 0b8ead22..0ec83813 100644
--- a/codec/processing/src/arm64/pixel_sad_aarch64_neon.S
+++ b/codec/processing/src/arm64/pixel_sad_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 WELS_ASM_AARCH64_FUNC_BEGIN WelsProcessingSampleSad8x8_AArch64_neon
@@ -47,4 +46,4 @@ WELS_ASM_AARCH64_FUNC_BEGIN WelsProcessingSampleSad8x8_AArch64_neon
     fmov    w0, s2
 WELS_ASM_AARCH64_FUNC_END
 
-#endif
\ No newline at end of file
+#endif
diff --git a/codec/processing/src/arm64/vaa_calc_aarch64_neon.S b/codec/processing/src/arm64/vaa_calc_aarch64_neon.S
index 15432876..e6c872b2 100644
--- a/codec/processing/src/arm64/vaa_calc_aarch64_neon.S
+++ b/codec/processing/src/arm64/vaa_calc_aarch64_neon.S
@@ -31,7 +31,6 @@
  */
 
 #ifdef HAVE_NEON_AARCH64
-.text
 #include "arm_arch64_common_macro.S"
 
 #ifdef __APPLE__