This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit d3210803512896607ef32ca5a90f4b3774aed8f7
Author: chao an <anc...@xiaomi.com>
AuthorDate: Fri Dec 2 02:52:18 2022 +0800
arm/cortex-[a|r]: generating assemble code in ARM states by default
Signed-off-by: chao an <anc...@xiaomi.com>
---
arch/arm/src/armv7-a/arm_cpuhead.S | 2 ++
arch/arm/src/armv7-a/arm_fpuconfig.S | 2 ++
arch/arm/src/armv7-a/arm_head.S | 2 ++
arch/arm/src/armv7-a/arm_pghead.S | 2 ++
arch/arm/src/armv7-a/arm_vectoraddrexcptn.S | 8 ++------
arch/arm/src/armv7-a/arm_vectors.S | 2 ++
arch/arm/src/armv7-a/arm_vectortab.S | 3 +++
arch/arm/src/armv7-r/arm_fpuconfig.S | 2 ++
arch/arm/src/armv7-r/arm_head.S | 2 ++
arch/arm/src/armv7-r/arm_vectoraddrexcptn.S | 8 ++------
arch/arm/src/armv7-r/arm_vectors.S | 2 ++
arch/arm/src/armv7-r/arm_vectortab.S | 3 +++
12 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/arch/arm/src/armv7-a/arm_cpuhead.S
b/arch/arm/src/armv7-a/arm_cpuhead.S
index 07cd6fb12b..00edad25fb 100644
--- a/arch/arm/src/armv7-a/arm_cpuhead.S
+++ b/arch/arm/src/armv7-a/arm_cpuhead.S
@@ -68,6 +68,8 @@
****************************************************************************/
.text
+ .syntax unified
+ .arm
/****************************************************************************
* Name: __cpu[n]_start
diff --git a/arch/arm/src/armv7-a/arm_fpuconfig.S
b/arch/arm/src/armv7-a/arm_fpuconfig.S
index 06fa011d03..a45a38f34f 100644
--- a/arch/arm/src/armv7-a/arm_fpuconfig.S
+++ b/arch/arm/src/armv7-a/arm_fpuconfig.S
@@ -47,6 +47,8 @@
****************************************************************************/
.text
+ .syntax unified
+ .arm
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-a/arm_head.S b/arch/arm/src/armv7-a/arm_head.S
index 1452602202..5f0a6c3b32 100644
--- a/arch/arm/src/armv7-a/arm_head.S
+++ b/arch/arm/src/armv7-a/arm_head.S
@@ -168,6 +168,8 @@
*/
.text
+ .syntax unified
+ .arm
.global __start
.type __start, #function
diff --git a/arch/arm/src/armv7-a/arm_pghead.S
b/arch/arm/src/armv7-a/arm_pghead.S
index a76f53a4c1..b0c6533f2f 100644
--- a/arch/arm/src/armv7-a/arm_pghead.S
+++ b/arch/arm/src/armv7-a/arm_pghead.S
@@ -197,6 +197,8 @@
*/
.text
+ .syntax unified
+ .arm
.global __start
.type __start, #function
diff --git a/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S
b/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S
index 6a2cf85110..af407a4f58 100644
--- a/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S
+++ b/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S
@@ -46,12 +46,8 @@
****************************************************************************/
.text
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
- .text
+ .syntax unified
+ .arm
/****************************************************************************
* Name: arm_vectoraddrexcptn
diff --git a/arch/arm/src/armv7-a/arm_vectors.S
b/arch/arm/src/armv7-a/arm_vectors.S
index fb7c195c0f..12952621b4 100644
--- a/arch/arm/src/armv7-a/arm_vectors.S
+++ b/arch/arm/src/armv7-a/arm_vectors.S
@@ -152,6 +152,8 @@
****************************************************************************/
.text
+ .syntax unified
+ .arm
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-a/arm_vectortab.S
b/arch/arm/src/armv7-a/arm_vectortab.S
index 39528d5c08..66c30fc371 100644
--- a/arch/arm/src/armv7-a/arm_vectortab.S
+++ b/arch/arm/src/armv7-a/arm_vectortab.S
@@ -38,6 +38,9 @@
.eabi_attribute Tag_ABI_align_preserved, 1
#endif
+ .syntax unified
+ .arm
+
.globl _vector_start
.globl _vector_end
diff --git a/arch/arm/src/armv7-r/arm_fpuconfig.S
b/arch/arm/src/armv7-r/arm_fpuconfig.S
index 192aecb019..f6338c6cd5 100644
--- a/arch/arm/src/armv7-r/arm_fpuconfig.S
+++ b/arch/arm/src/armv7-r/arm_fpuconfig.S
@@ -47,6 +47,8 @@
****************************************************************************/
.text
+ .syntax unified
+ .arm
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-r/arm_head.S b/arch/arm/src/armv7-r/arm_head.S
index 5fd19f5dc4..5f417b5f15 100644
--- a/arch/arm/src/armv7-r/arm_head.S
+++ b/arch/arm/src/armv7-r/arm_head.S
@@ -131,6 +131,8 @@
*/
.text
+ .syntax unified
+ .arm
.global __start
.type __start, #function
diff --git a/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S
b/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S
index 02354752ee..cefe180ac0 100644
--- a/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S
+++ b/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S
@@ -46,12 +46,8 @@
****************************************************************************/
.text
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
- .text
+ .syntax unified
+ .arm
/****************************************************************************
* Name: arm_vectoraddrexcptn
diff --git a/arch/arm/src/armv7-r/arm_vectors.S
b/arch/arm/src/armv7-r/arm_vectors.S
index ab7a4b1b85..659ac8d249 100644
--- a/arch/arm/src/armv7-r/arm_vectors.S
+++ b/arch/arm/src/armv7-r/arm_vectors.S
@@ -106,6 +106,8 @@
****************************************************************************/
.text
+ .syntax unified
+ .arm
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-r/arm_vectortab.S
b/arch/arm/src/armv7-r/arm_vectortab.S
index 41db3f67e8..db48a055c8 100644
--- a/arch/arm/src/armv7-r/arm_vectortab.S
+++ b/arch/arm/src/armv7-r/arm_vectortab.S
@@ -38,6 +38,9 @@
.eabi_attribute Tag_ABI_align_preserved, 1
#endif
+ .syntax unified
+ .arm
+
.globl _vector_start
.globl _vector_end
