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

Drop include paths for ARM assembler #6713

Merged
merged 4 commits into from May 3, 2018

Conversation

Projects
None yet
5 participants
@theotherjimmy
Contributor

theotherjimmy commented Apr 23, 2018

Description

The arm assembler would include many, many include paths on the command
line corresponding to anywhere it's possible to locate a header file.
This caused the following problem in uvision:

assembling startup_nrf52832.S...
startup_nrf52832.S: error: A3907U: Via file
'.\build\startup_nrf52832._ia' command too long for buffer.

We work around this issue by dropping the include paths from the
assembler in both mbed compile and mbed export. This has the
advantage that it's consistent with IAR.

Pull request type

[X] Fix
[ ] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change
@cmonr

This comment has been minimized.

Contributor

cmonr commented Apr 23, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Apr 23, 2018

@@ -394,7 +394,7 @@
<MiscControls>{{asm_flags}}</MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath>{{include_paths}}</IncludePath>
<IncludePath></IncludePath>

This comment has been minimized.

@0xc0170

0xc0170 Apr 24, 2018

Member

This actually reverts ebc9289 and solves the problem @hug-dev was having by updating the path in targets/TARGET_ARM_SSG/TARGET_CM3DS_MPS2/device/TOOLCHAIN_ARM_STD/startup_MPS2.S ? The include is still there, where does assembler finds it? - not clear to me.

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Apr 24, 2018

@hug-dev Please review

@hug-dev

This comment has been minimized.

Contributor

hug-dev commented Apr 24, 2018

This is fine for me, as long as the preprocessor is called on the assembly file. I don't see the structure of files changing anytime soon so this is fine using relative path.

@0xc0170 0xc0170 added needs: work and removed needs: CI labels Apr 24, 2018

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Apr 26, 2018

Please review the build failures (similar are in jenkins CI)

theotherjimmy added some commits Apr 30, 2018

Extend a local version of the asm cmd list
 I was extending an object-local one instead of a call-local one
@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Apr 30, 2018

That should fix it.

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Apr 30, 2018

Build : SUCCESS

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

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.

@0xc0170

0xc0170 approved these changes May 1, 2018

@0xc0170 0xc0170 added ready for merge and removed needs: work labels May 3, 2018

@0xc0170 0xc0170 merged commit e43d21d into ARMmbed:master May 3, 2018

12 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/docs Local docs testing has passed
Details
travis-ci/events Passed, runtime is 10007 cycles (-171 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/littlefs Passed, code size is 10112B (+0.00%)
Details
travis-ci/tools Local tools testing has passed
Details

@0xc0170 0xc0170 removed the ready for merge label May 3, 2018

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