From 392eef8b6066616fbff122a4ca6330769e0a664c Mon Sep 17 00:00:00 2001 From: Stian Eklund Date: Tue, 28 Apr 2020 23:33:08 +0200 Subject: Add symtab (size info) for all external assembly functions Fixes #211 --- asm-cm7-r0p1.s | 2 ++ asm-v7.s | 4 ++++ asm-v8-main.s | 4 ++++ asm-v8.s | 5 +++++ asm.s | 20 ++++++++++++++++++++ 5 files changed, 35 insertions(+) diff --git a/asm-cm7-r0p1.s b/asm-cm7-r0p1.s index a9ebf4a..bb51bf3 100644 --- a/asm-cm7-r0p1.s +++ b/asm-cm7-r0p1.s @@ -1,5 +1,6 @@ .section .text.__basepri_max_cm7_r0p1 .global __basepri_max_cm7_r0p1 + .size __basepri_max_cm7_r0p1, . - __basepri_max_cm7_r0p1 .syntax unified .thumb_func __basepri_max_cm7_r0p1: @@ -14,6 +15,7 @@ __basepri_max_cm7_r0p1: .section .text.__basepri_w_cm7_r0p1 .global __basepri_w_cm7_r0p1 + .size __basepri_w_cm7_r0p1, . - __basepri_w_cm7_r0p1 .syntax unified .thumb_func __basepri_w_cm7_r0p1: diff --git a/asm-v7.s b/asm-v7.s index c4c6dfb..25d8c90 100644 --- a/asm-v7.s +++ b/asm-v7.s @@ -1,5 +1,6 @@ .section .text.__basepri_max .global __basepri_max + .size __basepri_max, . - __basepri_max .thumb_func __basepri_max: msr BASEPRI_MAX, r0 @@ -7,6 +8,7 @@ __basepri_max: .section .text.__basepri_r .global __basepri_r + .size __basepri_r, . - __basepri_r .thumb_func __basepri_r: mrs r0, BASEPRI @@ -14,6 +16,7 @@ __basepri_r: .section .text.__basepri_w .global __basepri_w + .size __basepri_w, . - __basepri_w .thumb_func __basepri_w: msr BASEPRI, r0 @@ -21,6 +24,7 @@ __basepri_w: .section .text.__faultmask .global __faultmask + .size __faultmask, . - __faultmask .thumb_func __faultmask: mrs r0, FAULTMASK diff --git a/asm-v8-main.s b/asm-v8-main.s index a59845c..915017c 100644 --- a/asm-v8-main.s +++ b/asm-v8-main.s @@ -1,5 +1,6 @@ .section .text.__msplim_r .global __msplim_r + .size __msplim_r, . - __msplim_r .thumb_func __msplim_r: mrs r0, MSPLIM @@ -7,6 +8,7 @@ __msplim_r: .section .text.__msplim_w .global __msplim_w + .size __msplim_w, . - __msplim_w .thumb_func __msplim_w: msr MSPLIM, r0 @@ -14,6 +16,7 @@ __msplim_w: .section .text.__psplim_r .global __psplim_r + .size __psplim_r, . - __psplim_r .thumb_func __psplim_r: mrs r0, PSPLIM @@ -21,6 +24,7 @@ __psplim_r: .section .text.__psplim_w .global __psplim_w + .size __psplim_w, . - __psplim_w .thumb_func __psplim_w: msr PSPLIM, r0 diff --git a/asm-v8.s b/asm-v8.s index b667bf0..86fa3ed 100644 --- a/asm-v8.s +++ b/asm-v8.s @@ -1,5 +1,6 @@ .section .text.__tt .global __tt + .size __tt, . - __tt .thumb_func __tt: tt r0, r0 @@ -7,6 +8,7 @@ __tt: .section .text.__ttt .global __ttt + .size __ttt, . - __ttt .thumb_func __ttt: ttt r0, r0 @@ -14,13 +16,16 @@ __ttt: .section .text.__tta .global __tta + .size __tta, . - __tta .thumb_func __tta: tta r0, r0 bx lr + .section .text.__ttat .global __ttat + .size __ttat, . - __ttat .thumb_func __ttat: ttat r0, r0 diff --git a/asm.s b/asm.s index ed1ec3f..b3a6aad 100644 --- a/asm.s +++ b/asm.s @@ -1,5 +1,6 @@ .section .text.__bkpt .global __bkpt + .size __bkpt, . - __bkpt .thumb_func __bkpt: bkpt @@ -7,6 +8,7 @@ __bkpt: .section .text.__control_r .global __control_r + .size __control_r, . - __control_r .thumb_func __control_r: mrs r0, CONTROL @@ -14,6 +16,7 @@ __control_r: .section .text.__control_w .global __control_w + .size __control_w, . - __control_w .thumb_func __control_w: msr CONTROL, r0 @@ -22,6 +25,7 @@ __control_w: .section .text.__cpsid .global __cpsid + .size __cpsid, . - __cpsid .thumb_func __cpsid: cpsid i @@ -29,6 +33,7 @@ __cpsid: .section .text.__cpsie .global __cpsie + .size __cpsie, . - __cpsie .thumb_func __cpsie: cpsie i @@ -36,6 +41,7 @@ __cpsie: .section .text.__delay .global __delay + .size __delay, . - __delay .syntax unified .thumb_func __delay: @@ -47,6 +53,7 @@ __delay: .section .text.__dmb .global __dmb + .size __dmb, . - __dmb .thumb_func __dmb: dmb 0xF @@ -54,6 +61,7 @@ __dmb: .section .text.__dsb .global __dsb + .size __dsb, . - __dsb .thumb_func __dsb: dsb 0xF @@ -61,6 +69,7 @@ __dsb: .section .text.__isb .global __isb + .size __isb, . - __isb .thumb_func __isb: isb 0xF @@ -68,6 +77,7 @@ __isb: .section .text.__msp_r .global __msp_r + .size __msp_r, . - __msp_r .thumb_func __msp_r: mrs r0, MSP @@ -75,6 +85,7 @@ __msp_r: .section .text.__msp_w .global __msp_w + .size __msp_w, . - __msp_w .thumb_func __msp_w: msr MSP, r0 @@ -82,12 +93,14 @@ __msp_w: .section .text.__nop .global __nop + .size __nop, . - __nop .thumb_func __nop: bx lr .section .text.__primask .global __primask + .size __primask, . - __primask .thumb_func __primask: mrs r0, PRIMASK @@ -95,6 +108,7 @@ __primask: .section .text.__psp_r .global __psp_r + .size __psp_r, . - __psp_r .thumb_func __psp_r: mrs r0, PSP @@ -102,6 +116,7 @@ __psp_r: .section .text.__psp_w .global __psp_w + .size __psp_w, . - __psp_w .thumb_func __psp_w: msr PSP, r0 @@ -109,6 +124,7 @@ __psp_w: .section .text.__sev .global __sev + .size __sev, . - __sev .thumb_func __sev: sev @@ -117,19 +133,23 @@ __sev: .section .text.__udf .global __udf + .size __udf, . - __udf .thumb_func __udf: udf .section .text.__wfe .global __wfe + .size __wfe, . - __wfe .thumb_func __wfe: wfe bx lr + .section .text.__wfi .global __wfi + .size __wfi, . - __wfi .thumb_func __wfi: wfi -- cgit v1.2.3 From 28de254036fcf7de268436c77fe2db8bb1fcee4a Mon Sep 17 00:00:00 2001 From: Stian Eklund Date: Wed, 29 Apr 2020 00:04:04 +0200 Subject: fixup! Add symtab (size info) for all external assembly functions --- asm-cm7-r0p1.s | 4 ++-- asm-v7.s | 8 ++++---- asm-v8-main.s | 8 ++++---- asm-v8.s | 8 ++++---- asm.s | 38 +++++++++++++++++++------------------- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/asm-cm7-r0p1.s b/asm-cm7-r0p1.s index bb51bf3..9a1c0e3 100644 --- a/asm-cm7-r0p1.s +++ b/asm-cm7-r0p1.s @@ -1,6 +1,5 @@ .section .text.__basepri_max_cm7_r0p1 .global __basepri_max_cm7_r0p1 - .size __basepri_max_cm7_r0p1, . - __basepri_max_cm7_r0p1 .syntax unified .thumb_func __basepri_max_cm7_r0p1: @@ -12,10 +11,10 @@ __basepri_max_cm7_r0p1: bxne lr cpsie i bx lr + .size __basepri_max_cm7_r0p1, . - __basepri_max_cm7_r0p1 .section .text.__basepri_w_cm7_r0p1 .global __basepri_w_cm7_r0p1 - .size __basepri_w_cm7_r0p1, . - __basepri_w_cm7_r0p1 .syntax unified .thumb_func __basepri_w_cm7_r0p1: @@ -27,3 +26,4 @@ __basepri_w_cm7_r0p1: bxne lr cpsie i bx lr + .size __basepri_w_cm7_r0p1, . - __basepri_w_cm7_r0p1 diff --git a/asm-v7.s b/asm-v7.s index 25d8c90..a98027c 100644 --- a/asm-v7.s +++ b/asm-v7.s @@ -1,31 +1,31 @@ .section .text.__basepri_max .global __basepri_max - .size __basepri_max, . - __basepri_max .thumb_func __basepri_max: msr BASEPRI_MAX, r0 bx lr + .size __basepri_max, . - __basepri_max .section .text.__basepri_r .global __basepri_r - .size __basepri_r, . - __basepri_r .thumb_func __basepri_r: mrs r0, BASEPRI bx lr + .size __basepri_r, . - __basepri_r .section .text.__basepri_w .global __basepri_w - .size __basepri_w, . - __basepri_w .thumb_func __basepri_w: msr BASEPRI, r0 bx lr + .size __basepri_w, . - __basepri_w .section .text.__faultmask .global __faultmask - .size __faultmask, . - __faultmask .thumb_func __faultmask: mrs r0, FAULTMASK bx lr + .size __faultmask, . - __faultmask diff --git a/asm-v8-main.s b/asm-v8-main.s index 915017c..2928b2a 100644 --- a/asm-v8-main.s +++ b/asm-v8-main.s @@ -1,32 +1,32 @@ .section .text.__msplim_r .global __msplim_r - .size __msplim_r, . - __msplim_r .thumb_func __msplim_r: mrs r0, MSPLIM bx lr + .size __msplim_r, . - __msplim_r .section .text.__msplim_w .global __msplim_w - .size __msplim_w, . - __msplim_w .thumb_func __msplim_w: msr MSPLIM, r0 bx lr + .size __msplim_w, . - __msplim_w .section .text.__psplim_r .global __psplim_r - .size __psplim_r, . - __psplim_r .thumb_func __psplim_r: mrs r0, PSPLIM bx lr + .size __psplim_r, . - __psplim_r .section .text.__psplim_w .global __psplim_w - .size __psplim_w, . - __psplim_w .thumb_func __psplim_w: msr PSPLIM, r0 bx lr + .size __psplim_w, . - __psplim_w diff --git a/asm-v8.s b/asm-v8.s index 86fa3ed..e1d62ff 100644 --- a/asm-v8.s +++ b/asm-v8.s @@ -1,32 +1,32 @@ .section .text.__tt .global __tt - .size __tt, . - __tt .thumb_func __tt: tt r0, r0 bx lr + .size __tt, . - __tt .section .text.__ttt .global __ttt - .size __ttt, . - __ttt .thumb_func __ttt: ttt r0, r0 bx lr + .size __ttt, . - __ttt .section .text.__tta .global __tta - .size __tta, . - __tta .thumb_func __tta: tta r0, r0 bx lr + .size __tta, . - __tta .section .text.__ttat .global __ttat - .size __ttat, . - __ttat .thumb_func __ttat: ttat r0, r0 bx lr + .size __ttat, . - __ttat diff --git a/asm.s b/asm.s index b3a6aad..1c3fb58 100644 --- a/asm.s +++ b/asm.s @@ -1,47 +1,46 @@ .section .text.__bkpt .global __bkpt - .size __bkpt, . - __bkpt .thumb_func __bkpt: bkpt bx lr + .size __bkpt, . - __bkpt .section .text.__control_r .global __control_r - .size __control_r, . - __control_r .thumb_func __control_r: mrs r0, CONTROL bx lr + .size __control_r, . - __control_r .section .text.__control_w .global __control_w - .size __control_w, . - __control_w .thumb_func __control_w: msr CONTROL, r0 bx lr + .size __control_w, . - __control_w .section .text.__cpsid .global __cpsid - .size __cpsid, . - __cpsid .thumb_func __cpsid: cpsid i bx lr + .size __cpsid, . - __cpsid .section .text.__cpsie .global __cpsie - .size __cpsie, . - __cpsie .thumb_func __cpsie: cpsie i bx lr + .size __cpsie, . - __cpsie .section .text.__delay .global __delay - .size __delay, . - __delay .syntax unified .thumb_func __delay: @@ -50,107 +49,108 @@ __delay: subs r0, #1 bne 1b // Branch to 1 instead of __delay does not generate R_ARM_THM_JUMP8 relocation, which breaks linking on the thumbv6m-none-eabi target bx lr + .size __delay, . - __delay .section .text.__dmb .global __dmb - .size __dmb, . - __dmb .thumb_func __dmb: dmb 0xF bx lr + .size __dmb, . - __dmb .section .text.__dsb .global __dsb - .size __dsb, . - __dsb .thumb_func __dsb: dsb 0xF bx lr + .size __dsb, . - __dsb .section .text.__isb .global __isb - .size __isb, . - __isb .thumb_func __isb: isb 0xF bx lr + .size __isb, . - __isb .section .text.__msp_r .global __msp_r - .size __msp_r, . - __msp_r .thumb_func __msp_r: mrs r0, MSP bx lr + .size __msp_r, . - __msp_r .section .text.__msp_w .global __msp_w - .size __msp_w, . - __msp_w .thumb_func __msp_w: msr MSP, r0 bx lr + .size __msp_w, . - __msp_w .section .text.__nop .global __nop - .size __nop, . - __nop .thumb_func __nop: bx lr + .size __nop, . - __nop .section .text.__primask .global __primask - .size __primask, . - __primask .thumb_func __primask: mrs r0, PRIMASK bx lr + .size __primask, . - __primask .section .text.__psp_r .global __psp_r - .size __psp_r, . - __psp_r .thumb_func __psp_r: mrs r0, PSP bx lr + .size __psp_r, . - __psp_r .section .text.__psp_w .global __psp_w - .size __psp_w, . - __psp_w .thumb_func __psp_w: msr PSP, r0 bx lr + .size __psp_w, . - __psp_w .section .text.__sev .global __sev - .size __sev, . - __sev .thumb_func __sev: sev bx lr + .size __sev, . - __sev .section .text.__udf .global __udf - .size __udf, . - __udf .thumb_func __udf: udf + .size __udf, . - __udf .section .text.__wfe .global __wfe - .size __wfe, . - __wfe .thumb_func __wfe: wfe bx lr + .size __wfe, . - __wfe .section .text.__wfi .global __wfi - .size __wfi, . - __wfi .thumb_func __wfi: wfi + .size __wfi, . - __wfi bx lr -- cgit v1.2.3 From 4e58be22278f99a7cdcf170af6a32ebaabfe2d82 Mon Sep 17 00:00:00 2001 From: Stian Eklund Date: Tue, 5 May 2020 21:18:25 +0200 Subject: Bring blobs up to date fixing merge conflict Fixes merge conflict between #210 & #212 --- bin/thumbv6m-none-eabi.a | Bin 5126 -> 5126 bytes bin/thumbv7em-none-eabi.a | Bin 9438 -> 9422 bytes bin/thumbv7em-none-eabihf.a | Bin 9438 -> 9422 bytes bin/thumbv7m-none-eabi.a | Bin 7388 -> 7380 bytes bin/thumbv8m.base-none-eabi.a | Bin 7318 -> 7310 bytes bin/thumbv8m.main-none-eabi.a | Bin 11920 -> 11904 bytes bin/thumbv8m.main-none-eabihf.a | Bin 11920 -> 11904 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/bin/thumbv6m-none-eabi.a b/bin/thumbv6m-none-eabi.a index 29a5cd0..9dcc483 100644 Binary files a/bin/thumbv6m-none-eabi.a and b/bin/thumbv6m-none-eabi.a differ diff --git a/bin/thumbv7em-none-eabi.a b/bin/thumbv7em-none-eabi.a index 035391a..fb3858b 100644 Binary files a/bin/thumbv7em-none-eabi.a and b/bin/thumbv7em-none-eabi.a differ diff --git a/bin/thumbv7em-none-eabihf.a b/bin/thumbv7em-none-eabihf.a index 035391a..fb3858b 100644 Binary files a/bin/thumbv7em-none-eabihf.a and b/bin/thumbv7em-none-eabihf.a differ diff --git a/bin/thumbv7m-none-eabi.a b/bin/thumbv7m-none-eabi.a index fbff647..07855a9 100644 Binary files a/bin/thumbv7m-none-eabi.a and b/bin/thumbv7m-none-eabi.a differ diff --git a/bin/thumbv8m.base-none-eabi.a b/bin/thumbv8m.base-none-eabi.a index 1deebab..363a109 100644 Binary files a/bin/thumbv8m.base-none-eabi.a and b/bin/thumbv8m.base-none-eabi.a differ diff --git a/bin/thumbv8m.main-none-eabi.a b/bin/thumbv8m.main-none-eabi.a index 3da2d83..001ebb2 100644 Binary files a/bin/thumbv8m.main-none-eabi.a and b/bin/thumbv8m.main-none-eabi.a differ diff --git a/bin/thumbv8m.main-none-eabihf.a b/bin/thumbv8m.main-none-eabihf.a index 3da2d83..001ebb2 100644 Binary files a/bin/thumbv8m.main-none-eabihf.a and b/bin/thumbv8m.main-none-eabihf.a differ -- cgit v1.2.3