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

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

Merged
merged 4 commits into from Jun 14, 2018

Conversation

Projects
None yet
5 participants
@theotherjimmy
Contributor

theotherjimmy commented Jun 12, 2018

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 Jun 12, 2018

@@ -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":

This comment has been minimized.

@cmonr

cmonr Jun 13, 2018

Contributor

Typo?

This comment has been minimized.

@theotherjimmy
@cmonr

LGTM aside for a possible typo and a question.

def _get_toolchain_labels(self):
toolchain_labels = [c.__name__ for c in getmro(self.__class__)]
toolchain_labels.remove('mbedToolchain')
toolchain_labels.remove('object')

This comment has been minimized.

@cmonr

cmonr Jun 13, 2018

Contributor

Why is 'object' now also being removed?

This comment has been minimized.

@theotherjimmy

theotherjimmy Jun 13, 2018

Contributor

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

@cmonr cmonr added the needs: work label Jun 13, 2018

@cmonr

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

@cmonr cmonr dismissed their stale review Jun 13, 2018

Question about possible typo

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Jun 13, 2018

@cmonr Ready for review.

@cmonr

cmonr approved these changes Jun 13, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Jun 13, 2018

/morph build

@mbed-ci

This comment has been minimized.

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

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@cmonr cmonr removed the needs: review label Jun 14, 2018

@cmonr cmonr merged commit 10d9f7f into ARMmbed:master Jun 14, 2018

14 checks passed

AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-mbed2-build build completed
Details
ci-morph-test test completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
travis-ci/astyle Passed, 922 files
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/events Passed, runtime is 9987 cycles (+381 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 9964B (+0.00%)
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jun 15, 2018

@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

This comment has been minimized.

Contributor

adbridge commented Jun 15, 2018

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

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Jun 15, 2018

@adbridge On it. Thanks for the heads up.

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Jun 15, 2018

just noticed that the Mbed2 bulids are serialized.

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Jun 15, 2018

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

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Jun 15, 2018

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

This comment has been minimized.

Contributor

theotherjimmy commented Jun 15, 2018

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

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