Skip to content

Fix include paths for the assembler for makefiles #9946

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
Mar 6, 2019

Conversation

bridadan
Copy link
Contributor

@bridadan bridadan commented Mar 5, 2019

Description

Should fix #9938.

Seems to work fine with ARMC5, ARMC6, and GCC_ARM.

Pull request type

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

Reviewers

@0xc0170 - I tried my darndest to get git to ignore the whitespace changes, but I couldn't figure it out. If you feel really strongly about it let me know.

Release Notes

Copy link
Contributor

@0xc0170 0xc0170 left a comment

Choose a reason for hiding this comment

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

Would be nice to have spaces out of the picture, lets get this in CI asap

new_sub_flags = []
for sub_flag in sub_flags:
new_sub_flags.append(_fix_include_asm_flag(sub_flag, ctx))
new_asm_flags.append(','.join(new_sub_flags))
Copy link
Contributor

Choose a reason for hiding this comment

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

one question - how does this fixes the issue - why paths for asm preprocessed files were not correct? I can see magic above based on -I or preinclude - shall we add some details to the commit msg?

The Makefile is run from the build directory. The source files were
properly prefixed with "../", however the paths provided to the
assmebler were not. This ensures the assembler include paths are
prefixed properly.
@cmonr
Copy link
Contributor

cmonr commented Mar 5, 2019

CI started

@cmonr
Copy link
Contributor

cmonr commented Mar 5, 2019

@bridadan bridadan force-pushed the fix_make_armc6 branch 2 times, most recently from 17e68b3 to c129336 Compare March 5, 2019 21:31
@bridadan
Copy link
Contributor Author

bridadan commented Mar 5, 2019

I fixed my dumb syntax error and updated the commit message. I will run further tests locally in the meantime.

@cmonr
Copy link
Contributor

cmonr commented Mar 5, 2019

CI restarted

@bridadan
Copy link
Contributor Author

bridadan commented Mar 5, 2019

Ug, think there might be more issues, still debugging.

@cmonr
Copy link
Contributor

cmonr commented Mar 5, 2019

Ug, think there might be more issues, still debugging.

Kk. Will let CI still run in the meanwhile.

Out of curiosity, do we have a way to test against the online compiler, or would we need to locally test somehow?

@bridadan
Copy link
Contributor Author

bridadan commented Mar 5, 2019

@cmonr pretty sure the issue I was seeing locally was a problem with my path config, not the implementation. Trying now.

Regarding the online compiler, we would need to test this when we make a tools release as this change wouldn't go live until then.

@ghost ghost added the PM_ACCEPTED label Mar 5, 2019
@mbed-ci
Copy link

mbed-ci commented Mar 6, 2019

Test run: SUCCESS

Summary: 13 of 13 test jobs passed
Build number : 2
Build artifacts

@cmonr cmonr merged commit b35b37d into ARMmbed:master Mar 6, 2019
@cmonr cmonr removed the needs: CI label Mar 6, 2019
@cmonr
Copy link
Contributor

cmonr commented Mar 6, 2019

Merging to see if this unblocks the other 5.12 PRs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

make armc6: error 8 for assembly file
4 participants