Improve Arm Compiler 6 compatibility #1710

Open

will-v-pi wants to merge 2 commits from will-v-pi/cmsis/develop into develop

will-v-pi commented

2024-05-21 09:30:13 -05:00

(Migrated from github.com)

Add some more #ifndefs to improve compatibility with Arm Compiler 6. This branch of the SDK has been used in the RP2xxx_DFP

Additionally AC6 doesn't use the same linker scripts, so is missing the preinit_array and init_array definitions, along with some clock_t libraries used in runtime.c.

Add some more `#ifndef`s to improve compatibility with Arm Compiler 6. This branch of the SDK has been used in the [RP2xxx_DFP](https://github.com/raspberrypi/CMSIS-RP2xxx-DFP) Additionally AC6 doesn't use the same linker scripts, so is missing the preinit_array and init_array definitions, along with some clock_t libraries used in `runtime.c`.

GorgonMeducer commented

2024-05-21 18:47:16 -05:00

(Migrated from github.com)

Please also add the following changes to be compatible with cmsis 6.1.0:

Please also add the following changes to be compatible with cmsis 6.1.0: ![image](https://github.com/raspberrypi/pico-sdk/assets/13148491/b37775a5-fd9c-4f23-9215-e566a8e930b1)

will-v-pi commented

2024-05-22 04:53:20 -05:00

(Migrated from github.com)

Have added those changes in - thanks

👍 1

This pull request has changes conflicting with the target branch.

src/rp2_common/pico_platform/include/pico/platform.h
src/rp2_common/pico_runtime/runtime.c

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'Improve Arm Compiler 6 compatibility' (#1710) from will-v-pi/cmsis/develop into develop

Merge commit body

Reviewed-on: https://git.richey.dev/gh-raspberrypi/pico-sdk/pulls/1710

Merge pull request 'Improve Arm Compiler 6 compatibility' (#1710) from will-v-pi/cmsis/develop into develop

Reviewed-on: https://git.richey.dev/gh-raspberrypi/pico-sdk/pulls/1710

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 'will-v-pi/cmsis/develop:will-v-pi/cmsis/develop'

git switch 'will-v-pi/cmsis/develop'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'develop'

git merge --no-ff 'will-v-pi/cmsis/develop'

git switch 'will-v-pi/cmsis/develop'

git rebase 'develop'

git switch 'develop'

git merge --ff-only 'will-v-pi/cmsis/develop'

git switch 'will-v-pi/cmsis/develop'

git rebase 'develop'

git switch 'develop'

git merge --no-ff 'will-v-pi/cmsis/develop'

git switch 'develop'

git merge --squash 'will-v-pi/cmsis/develop'