diff options
author | 2018-08-07 19:24:43 +0000 | |
---|---|---|
committer | 2018-08-07 19:24:43 +0000 | |
commit | 13b87923deed801adb3f6412efa2c05dc43304c4 (patch) | |
tree | 548809857b718a4bf482745c1f67cb0aecc4637b | |
parent | ad6b8dd5e22774515d0b25e2d2cffdb3be4b3de6 (diff) | |
parent | be9978e6707a7ba930db5c3f300406020cc838ca (diff) | |
download | cortex-m-13b87923deed801adb3f6412efa2c05dc43304c4.tar.gz cortex-m-13b87923deed801adb3f6412efa2c05dc43304c4.tar.zst cortex-m-13b87923deed801adb3f6412efa2c05dc43304c4.zip |
Merge #103
103: mark all assembly functions as .thumb_func r=adamgreig a=japaric
this works around a [LLD bug] related to interworking.
[LLD bug]: https://bugs.llvm.org/show_bug.cgi?id=38435
Co-authored-by: Jorge Aparicio <jorge@japaric.io>
-rw-r--r-- | asm/basepri_max-cm7-r0p1.s | 1 | ||||
-rw-r--r-- | asm/basepri_max.s | 1 | ||||
-rw-r--r-- | asm/basepri_r.s | 1 | ||||
-rw-r--r-- | asm/basepri_w-cm7-r0p1.s | 1 | ||||
-rw-r--r-- | asm/basepri_w.s | 1 | ||||
-rw-r--r-- | asm/bkpt.s | 1 | ||||
-rw-r--r-- | asm/control.s | 1 | ||||
-rw-r--r-- | asm/cpsid.s | 1 | ||||
-rw-r--r-- | asm/cpsie.s | 1 | ||||
-rw-r--r-- | asm/dmb.s | 1 | ||||
-rw-r--r-- | asm/dsb.s | 1 | ||||
-rw-r--r-- | asm/faultmask.s | 1 | ||||
-rw-r--r-- | asm/isb.s | 1 | ||||
-rw-r--r-- | asm/msp_r.s | 1 | ||||
-rw-r--r-- | asm/msp_w.s | 1 | ||||
-rw-r--r-- | asm/nop.s | 1 | ||||
-rw-r--r-- | asm/primask.s | 1 | ||||
-rw-r--r-- | asm/psp_r.s | 1 | ||||
-rw-r--r-- | asm/psp_w.s | 1 | ||||
-rw-r--r-- | asm/sev.s | 1 | ||||
-rw-r--r-- | asm/wfe.s | 1 | ||||
-rw-r--r-- | asm/wfi.s | 1 |
22 files changed, 22 insertions, 0 deletions
diff --git a/asm/basepri_max-cm7-r0p1.s b/asm/basepri_max-cm7-r0p1.s index 573bd9c..57cbe0c 100644 --- a/asm/basepri_max-cm7-r0p1.s +++ b/asm/basepri_max-cm7-r0p1.s @@ -1,5 +1,6 @@ .global __basepri_max .syntax unified + .thumb_func __basepri_max: mrs r1, PRIMASK cpsid i diff --git a/asm/basepri_max.s b/asm/basepri_max.s index 0ac3a5e..32bef7c 100644 --- a/asm/basepri_max.s +++ b/asm/basepri_max.s @@ -1,4 +1,5 @@ .global __basepri_max + .thumb_func __basepri_max: msr BASEPRI_MAX, r0 bx lr diff --git a/asm/basepri_r.s b/asm/basepri_r.s index 9f727ab..971b152 100644 --- a/asm/basepri_r.s +++ b/asm/basepri_r.s @@ -1,4 +1,5 @@ .global __basepri_r + .thumb_func __basepri_r: mrs r0, BASEPRI bx lr diff --git a/asm/basepri_w-cm7-r0p1.s b/asm/basepri_w-cm7-r0p1.s index 5ac0209..4f74f57 100644 --- a/asm/basepri_w-cm7-r0p1.s +++ b/asm/basepri_w-cm7-r0p1.s @@ -1,5 +1,6 @@ .global __basepri_w .syntax unified + .thumb_func __basepri_w: mrs r1, PRIMASK cpsid i diff --git a/asm/basepri_w.s b/asm/basepri_w.s index b1f8709..323d42d 100644 --- a/asm/basepri_w.s +++ b/asm/basepri_w.s @@ -1,4 +1,5 @@ .global __basepri_w + .thumb_func __basepri_w: msr BASEPRI, r0 bx lr @@ -1,4 +1,5 @@ .global __bkpt + .thumb_func __bkpt: bkpt bx lr diff --git a/asm/control.s b/asm/control.s index 81c35e6..ae1ac7e 100644 --- a/asm/control.s +++ b/asm/control.s @@ -1,4 +1,5 @@ .global __control + .thumb_func __control: mrs r0, CONTROL bx lr diff --git a/asm/cpsid.s b/asm/cpsid.s index ae4701d..c52408a 100644 --- a/asm/cpsid.s +++ b/asm/cpsid.s @@ -1,4 +1,5 @@ .global __cpsid + .thumb_func __cpsid: cpsid i bx lr diff --git a/asm/cpsie.s b/asm/cpsie.s index cba3a39..22556ff 100644 --- a/asm/cpsie.s +++ b/asm/cpsie.s @@ -1,4 +1,5 @@ .global __cpsie + .thumb_func __cpsie: cpsie i bx lr @@ -1,4 +1,5 @@ .global __dmb + .thumb_func __dmb: dmb 0xF bx lr @@ -1,4 +1,5 @@ .global __dsb + .thumb_func __dsb: dsb 0xF bx lr diff --git a/asm/faultmask.s b/asm/faultmask.s index 5f08370..1db599f 100644 --- a/asm/faultmask.s +++ b/asm/faultmask.s @@ -1,4 +1,5 @@ .global __faultmask + .thumb_func __faultmask: mrs r0, FAULTMASK bx lr @@ -1,4 +1,5 @@ .global __isb + .thumb_func __isb: isb 0xF bx lr diff --git a/asm/msp_r.s b/asm/msp_r.s index b31a715..920bac2 100644 --- a/asm/msp_r.s +++ b/asm/msp_r.s @@ -1,4 +1,5 @@ .global __msp_r + .thumb_func __msp_r: mrs r0, MSP bx lr diff --git a/asm/msp_w.s b/asm/msp_w.s index c589c0e..b4b6c3e 100644 --- a/asm/msp_w.s +++ b/asm/msp_w.s @@ -1,4 +1,5 @@ .global __msp_w + .thumb_func __msp_w: msr MSP, r0 bx lr @@ -1,3 +1,4 @@ .global __nop + .thumb_func __nop: bx lr diff --git a/asm/primask.s b/asm/primask.s index a3ff709..9735008 100644 --- a/asm/primask.s +++ b/asm/primask.s @@ -1,4 +1,5 @@ .global __primask + .thumb_func __primask: mrs r0, PRIMASK bx lr diff --git a/asm/psp_r.s b/asm/psp_r.s index 1c5ff81..ea093b3 100644 --- a/asm/psp_r.s +++ b/asm/psp_r.s @@ -1,4 +1,5 @@ .global __psp_r + .thumb_func __psp_r: mrs r0, PSP bx lr diff --git a/asm/psp_w.s b/asm/psp_w.s index 8ad1559..dee5a79 100644 --- a/asm/psp_w.s +++ b/asm/psp_w.s @@ -1,4 +1,5 @@ .global __psp_w + .thumb_func __psp_w: msr PSP, r0 bx lr @@ -1,4 +1,5 @@ .global __sev + .thumb_func __sev: sev bx lr @@ -1,4 +1,5 @@ .global __wfe + .thumb_func __wfe: wfe bx lr @@ -1,4 +1,5 @@ .global __wfi + .thumb_func __wfi: wfi bx lr |