Skip to content

Add ARMC6 where appropriate #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2017

Conversation

theotherjimmy
Copy link
Contributor

@theotherjimmy theotherjimmy commented Aug 14, 2017

DO NOT MERGE BEFORE ARMmbed/mbed-os#4949 IS MERGED

Copy link
Contributor

@AnotherButler AnotherButler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One tiny typo

Otherwise, this looks good. 👍

@@ -72,7 +72,7 @@ There are other entries that require a bit of clarification:

#### Current support

We have tested *memap* on Windows 7, Linux and Mac OS X. The `GCC_ARM` (GNU Arm Embedded Toolchain), Arm (Arm Compiler 5) and IAR toolchains generate memory map files.
We have tested *memap* on Windows 7, Linux and Mac OS X. The `GCC_ARM` (GNU Arm Embedded Toolchain), Arm Compiler 5, Arm Compiler 6 and IAR toolchains generate memory map files.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please delete the extra space after "and".

@AnotherButler
Copy link
Contributor

@theotherjimmy Please resolve conflicts if this is ready for me to merge.

@theotherjimmy
Copy link
Contributor Author

Rebase resolved it trivially, apparently.

@theotherjimmy
Copy link
Contributor Author

Just a sec, removing out of date info

@theotherjimmy
Copy link
Contributor Author

Done.

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Sep 14, 2017

Wait. One more to remove. nevermind, it's valid.

@theotherjimmy
Copy link
Contributor Author

Sorry for the noise. It's all correct now.

@AnotherButler AnotherButler merged commit 25519f0 into ARMmbed:new_engine Sep 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants