diff options
| author | Thomas Weißschuh <thomas@t-8ch.de> | 2021-07-06 01:24:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 00:24:48 +0100 |
| commit | a535d24ecfd465124cdb255e53b5cc301cbda6d9 (patch) | |
| tree | a7049fc8f613074b9e94673a987133365304d302 /tmk_core | |
| parent | 82137e14f24a12dbf16746b602d4912582b93b58 (diff) | |
| download | qmk_firmware-a535d24ecfd465124cdb255e53b5cc301cbda6d9.tar.gz qmk_firmware-a535d24ecfd465124cdb255e53b5cc301cbda6d9.zip | |
core: chibios: bootloader: use integer pointers as volatile (#13450)
This prevents gcc from incorrectly trying to validate array bounds.
```
tmk_core/common/chibios/bootloader.c: error: '__builtin_memcpy' offset [0, 21] is out of the bounds [0, 0] [-Werror=array-bounds]
107 | __builtin_memcpy((void *) VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578#c16
Fixes #12925
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/chibios/bootloader.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c index 76d52ea608..f9514ee5f3 100644 --- a/tmk_core/common/chibios/bootloader.c +++ b/tmk_core/common/chibios/bootloader.c @@ -103,7 +103,8 @@ void enter_bootloader_mode_if_requested(void) { # define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000 const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff"; __attribute__((weak)) void bootloader_jump(void) { - __builtin_memcpy((void *)VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic)); + void *volatile vbat = (void *)VBAT; + __builtin_memcpy(vbat, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic)); // request reset SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk; } |