Skip to content

Add missing END to Armv8M IAR assembly files #9295

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Jan 14, 2019
Merged

Add missing END to Armv8M IAR assembly files #9295

merged 2 commits into from
Jan 14, 2019

Conversation

deepikabhavnani
Copy link

Description

Add missing END to Armv8M IAR assembly files.

Pull request type

[X] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@ciarmcom ciarmcom requested review from a team January 8, 2019 22:00
@ciarmcom
Copy link
Member

ciarmcom commented Jan 8, 2019

@deepikabhavnani, thank you for your changes.
@ARMmbed/mbed-os-tools @ARMmbed/mbed-os-core @ARMmbed/mbed-os-maintainers please review.

bridadan
bridadan approved these changes Jan 8, 2019
View reviewed changes
Copy link
Contributor

@bridadan bridadan left a comment

Choose a reason for hiding this comment

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

Looks good

@kjbracey
Copy link
Contributor

kjbracey commented Jan 9, 2019

The new ENDs are themselves missing newlines, if GitHub's diff view is to be believed.

SenRamakri
SenRamakri reviewed Jan 9, 2019
View reviewed changes
tools/importer/cmsis_importer.json Outdated
@@ -149,7 +149,8 @@
"b88254809eb626689c8aeb41304a308bf4e34a04",
"287121ffdc4c9c19f9ce8872e4edd941862daca1",
"1752803626865147dca92f30a39cef8d04581736",
"6a6e3ac0ebab1a6b6aa08d0928702c79562acee9"
"6a6e3ac0ebab1a6b6aa08d0928702c79562acee9",
"fea73b6c93b0471628b4699edaedc8a57e5ec70b"
Copy link
Contributor

Choose a reason for hiding this comment

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

@deepikabhavnani - Can you please clarify what this change is for?

Copy link
Author

Choose a reason for hiding this comment

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

This change is to keep track of all changes we do on top of Cmsis files. Assembly file changed here is pulled from CMSIS repo, and is updated to add missing END. This change will be needed whenever we do CMSIS update

Copy link
Author

Choose a reason for hiding this comment

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

Change is not needed for CMSIS repo, since they do not use _common.S for secure / non-secure targets. CMSIS has 3 files, 1 each for secure and non-secure and 1 common file which is included from other two.END is present in files which include common file

@cmonr
Copy link
Contributor

cmonr commented Jan 9, 2019

@deepikabhavnani

The new ENDs are themselves missing newlines, if GitHub's diff view is to be believed.

Do the assembly files need newlines?

cmonr
cmonr approved these changes Jan 9, 2019
View reviewed changes
Copy link
Contributor

@cmonr cmonr left a comment

Choose a reason for hiding this comment

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

LGTM, pending question about newlines.

@deepikabhavnani
Copy link
Author

Do the assembly files need newlines?

I am not sure of that, absence of newline won't cause any failures https://github.com/ARM-software/CMSIS_5/blob/develop/CMSIS/RTOS2/RTX/Source/IAR/irq_armv8mbl_ns.s#L4

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 10, 2019 •
edited
Loading

Not failure, but a warning should be.

We default to leave one line in our coding style. ARMCC5 warns about it by default I recall: "No newline at end of file"

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 10, 2019 •
edited
Loading

Previously they were there (empty line at the end), and other files as well in their sources, I checked few.

To avoid warnings, we shall add it here.

This shall be fixed in RTX

@kjbracey
Copy link
Contributor

Previously they were there (empty line at the end),

Pedant alert - it's not an empty line, it's just terminating the "END" line properly.

CMSIS/RTX: Update Armv8M IAR 8.x assembly files - add END
b228cd9 
Add missing END to the IAR assembly files. In future this commit should be
merged to other assembly file commit, when performing CMSIS update.
ARMmbed@287121f
Added IAR assembly file update commit to cmsis importer
09db656 
In future when performing CMSIS update b228cd9
commit can be merged to 287121f -
CMSIS/RTX: Pre-processor defines used for assembly
@deepikabhavnani
Copy link
Author

Added a new line, but I warnings were for C/Cpp files if I am correct and not for assembly files. Also this change is only for IAR.

@deepikabhavnani
Copy link
Author

This shall be fixed in RTX

I tried build with no new line at the end and got no warnings.

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 11, 2019

CI started

@mbed-ci
Copy link

mbed-ci commented Jan 11, 2019

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 1
Build artifacts

@0xc0170 0xc0170 merged commit 116e42f into ARMmbed:master Jan 14, 2019
@deepikabhavnani deepikabhavnani deleted the iar_asm branch January 23, 2019 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SenRamakri SenRamakri SenRamakri left review comments

@cmonr cmonr cmonr approved these changes

@bridadan bridadan bridadan approved these changes

Assignees
No one assigned
Labels
release-version: 5.11.2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@deepikabhavnani @ciarmcom @kjbracey @cmonr @0xc0170 @mbed-ci @bridadan @SenRamakri @NirSonnenschein