Skip to content

Tools: Allow exporting of uARM-only targets to uvision #7197

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 4 commits into from
Jun 14, 2018
Merged

Tools: Allow exporting of uARM-only targets to uvision #7197

merged 4 commits into from
Jun 14, 2018

Conversation

theotherjimmy
Copy link
Contributor

Description

Resolves #7184

This PR makes it possible to export targets that only support the
uARM toolchain through the uvision exporter. There were a few checks
that prevented this. These checks were changed. I also made the ARM
compiler heed the target.default_lib configuration parameter just
like the GCC_ARM toolchain. You no longer need to use uARM, possibly.

Pull request type

[x] Fix
[ ] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

@cmonr cmonr self-requested a review June 12, 2018 21:42
cmonr
cmonr reviewed Jun 13, 2018
View reviewed changes
tools/toolchains/arm.py Outdated
@@ -85,6 +91,12 @@ def __init__(self, target, notify=None, macros=None,

self.SHEBANG += " --cpu=%s" % cpu

def _get_toolchain_labels(self):
if getattr(self.target, "defalut_lib", "std") == "small":
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep

cmonr
cmonr previously approved these changes Jun 13, 2018
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 aside for a possible typo and a question.

tools/toolchains/__init__.py
def _get_toolchain_labels(self):
toolchain_labels = [c.__name__ for c in getmro(self.__class__)]
toolchain_labels.remove('mbedToolchain')
toolchain_labels.remove('object')
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is 'object' now also being removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because it was never supposed to be there in the first place and adds no information.

cmonr
cmonr reviewed Jun 13, 2018
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.

Er, meant for the last review to be a comment, not approve.

@cmonr cmonr dismissed their stale review June 13, 2018 02:46

Question about possible typo

@theotherjimmy
Copy link
Contributor Author

@cmonr Ready for review.

@cmonr
Copy link
Contributor

cmonr commented Jun 13, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Jun 13, 2018

Build : SUCCESS

Build number : 2345
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7197/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Jun 13, 2018

Exporter Build : SUCCESS

Build number : 1969
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7197/

@theotherjimmy theotherjimmy mentioned this pull request Jun 14, 2018
Closed
@mbed-ci
Copy link

mbed-ci commented Jun 14, 2018

Test : SUCCESS

Build number : 2130
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/7197/2130

@cmonr cmonr merged commit 10d9f7f into ARMmbed:master Jun 14, 2018
@0xc0170
Copy link
Contributor

0xc0170 commented Jun 15, 2018 •
edited
Loading

@studavekar Test for this PR did not run http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/mbed2-release/7197/PASS/NUCLEO_F207ZG/ - uARM that our release script does. Please review

If it would have run, it would have failed. I reproduced the issue locally. Assembly file (has not change for that target for over a year) does not compile.

@adbridge
Copy link
Contributor

adbridge commented Jun 15, 2018 •
edited
Loading

This is going to be bumped to 5.9.2 as it looks like it has broken mbed2 . @theotherjimmy please investigate why.

@theotherjimmy
Copy link
Contributor Author

@adbridge On it. Thanks for the heads up.

@theotherjimmy
Copy link
Contributor Author

just noticed that the Mbed2 bulids are serialized.

@theotherjimmy
Copy link
Contributor Author

I'm seeing that archive is successful despite that error :/

@theotherjimmy
Copy link
Contributor Author

the error you're reffering to:
http://mbed-os.s3-eu-west-1.amazonaws.com/builds/mbed2-release/7197/PASS/NUCLEO_F207ZG/ARM/34792e60c6cad202191b4e147b7ae8a7483a1232_build_log_NUCLEO_F207ZG_ARM.txt

[DEBUG] Errors: Creating archive '/builds/ws/mbed-os2-build-matrix/1011/NUCLEO_F207ZG_ARM/sources/mbed-os/BUILD/mbed/TARGET_NUCLEO_F207ZG/TOOLCHAIN_ARM_STD/mbed.ar'

Is just stderr output.

@theotherjimmy
Copy link
Contributor Author

Oh you mean that uARM did not run. Got it. 😉

@theotherjimmy theotherjimmy mentioned this pull request Jun 15, 2018
Merged
@bcostm bcostm mentioned this pull request Jul 27, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cmonr cmonr cmonr approved these changes

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

Successfully merging this pull request may close these issues.
5 participants
@theotherjimmy @cmonr @mbed-ci @0xc0170 @adbridge