ARMC5+6: Specify CPU for ARM scatter file preprocessor #5797

hosse005 · 2018-01-05T21:43:24Z

Fixes #5796

Description

Fix for targets which include the c preprocessor in the ARM and ARMC6 scatter file.

Status

READY

Migrations

NO

Steps to test or reproduce

Pull the mbed-os-example-blinky app
Import the latest mbed-os (>= mbed-os-5.5.4)
Compile with either the ARM or ARMC6 compiler and target the MultiTech xDot
(e.g. mbed compile -t ARMC6 -m xdot_l151cc)
Verify the app builds

Fixes ARMmbed#5796

hosse005 · 2018-01-05T21:47:03Z

/cc @maclobdell

theotherjimmy

Looks good. Thanks!

hosse005 · 2018-01-08T15:22:01Z

Looks like this is related to issue #5421 as well, but this solution is giving some problems with the k64f target saying ARM Compiler does not support '-mcpu=cortex-m4f' just for the arm 6 compiler. Maybe some additional string massaging needed here?

0xc0170 · 2018-01-08T16:34:13Z

@hosse005 Can you please sign https://os.mbed.com/contributor_agreement/

hosse005 · 2018-01-08T16:38:30Z

@0xc0170 Yes, I just accepted

0xc0170 · 2018-01-09T09:19:57Z

/morph build

mbed-ci · 2018-01-09T09:38:35Z

Build : FAILURE

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

0xc0170 · 2018-01-09T09:53:54Z

Build failed for one target, RZ_A1H, with the error [DEBUG] Errors: Error: L6636E: Pre-processor step failed for '/builds/ws/mbed-os-build-matrix/826/RZ_A1H_ARM/sources/mbed-os/BUILD/tests/RZ_A1H/ARM/./TESTS/netsocket/udp_echo/.link_script.sct' it complains about not finding a header file earlier in the log, can you please verify?

hosse005 · 2018-01-09T14:39:10Z

My license doesn't allow me to compile for an A9, so my help maybe limited here. Are we sure this ci job doesn't fail without these changes? Maybe the "mem_RZ_A1H.h" file isn't being copied into the build directory along with the MBRZA1H.sct file?

0xc0170 · 2018-01-10T15:00:15Z

I could reproduce it. The same linker failure. Master is OK, it's only this branch.

        [DEBUG] Errors: Error: L6636E: Pre-processor step failed for 'mbed-os/BUILD/tests/RZ_A1H/ARM/./TESTS/mbedmicro-rtos-mbed/mutex/.link_script.sct'

This is the top of the link_script.sct

#! armcc -E --cpu=Cortex-A9
;**************************************************
; Copyright (c) 2017 ARM Ltd.  All rights reserved.
;**************************************************

; Scatter-file for RTX Example on Versatile Express

; This scatter-file places application code, data, stack and heap at suitable addresses in the memory map.

#include "mem_RZ_A1H.h"

The only change when I compare those 2 is --cpu flag that is being added here. In the build dir, the header file is there. Could this cpu flag affect include dirs? I checked include dirs that are in the build file, the path is there for that header (in the include paths). Also in the build dir, it is present.

Why this cpu flag is added to the linker script file and not into .profile-asm ? (the cpu flag for C is in the .profile-c file). Does not help thought with this, fails anyway the same way.

* Need to copy headers into the build directory as well when also writing an updated linker scatter file to the build directory

hosse005 · 2018-01-10T22:01:26Z

I was able to get a hold of an eval license so I could reproduce the issue. I don't think headers were getting copied over from the script source directory when we needed to update the scatter file shebang. I made some change which should address this issue.

@0xc0170 , I added the cpu arg to the scatter file shebang because this is where I was seeing compile errors coming from, and it seemed to be needed at least for ARMC6 according to the ARM compiler v5 -> v6 migration app note (http://www.keil.com/appnotes/files/apnt_298.pdf)

0xc0170 · 2018-01-11T14:01:26Z

@0xc0170 , I added the cpu arg to the scatter file shebang because this is where I was seeing compile errors coming from, and it seemed to be needed at least for ARMC6 according to the ARM compiler v5 -> v6 migration app note (http://www.keil.com/appnotes/files/apnt_298.pdf)

👍 for the reference

I was able to get a hold of an eval license so I could reproduce the issue. I don't think headers were getting copied over from the script source directory when we needed to update the scatter file shebang. I made some change which should address this issue.

I was checking locally and to me the header files were there? I still have the build locally, BUILD\tests\RZ_A1H\ARM\targets\TARGET_RENESAS\TARGET_RZ_A1H\device\TOOLCHAIN_ARM_STD\ this is where mem_RZ_A1H header file is. What am I missing ?

hosse005 · 2018-01-11T14:44:01Z

Hmm.., @0xc0170 can you try to replicate my test setup? I am just building the mbed-os-example-blinky app with the ARM compiler targeting the RZ_A1H with the mbed-os changes in this PR. Without the last commit I see the same failures observed from the ci job logs, and with the last change it is resolved.

0xc0170 · 2018-01-12T10:15:46Z

I tested this fix with blinky , and also mutex test, both compiles on my machine.

0xc0170 · 2018-01-12T10:15:52Z

/morph build

mbed-ci · 2018-01-12T10:29:15Z

Build : SUCCESS

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

Triggering tests

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

mbed-ci · 2018-01-12T11:45:35Z

Exporter Build : FAILURE

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

mbed-ci · 2018-01-23T18:14:19Z

Exporter Build : FAILURE

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

hosse005 · 2018-01-23T18:36:07Z

I think abspath maybe needed here for the build machine as follows:
self.SHEBANG += " -I %s" % dirname(abspath(scatter_file))

@theotherjimmy , do you agree?

theotherjimmy · 2018-01-23T19:42:05Z

@hosse005 I do not. When you export a project from the online compile, an absolute path will always be incorrect.

We will have to make the path relative to the project file location, so relpath(scatter_file, self.build_dir) may be necessary

mbed-ci · 2018-01-23T21:35:31Z

Test : SUCCESS

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

hosse005 · 2018-01-24T17:19:10Z

@theotherjimmy , I think just relpath(dirname(scatter_file)) should work. The linker isn't executing from the build directory directly so that failed for me, but the above code relative to the current working directory worked for me, just not sure about the build machine? Thought I would ask first before pushing it up.

theotherjimmy · 2018-01-24T17:40:59Z

@hosse005 I don't think that relpath(dirname(scatter_file)) is an option either. When exporting in the online compiler, the tools are not executed from a project root, and projects do not have a single root. Instead, the tools are given a list of directories and where these directories will be in the final zip file. This makes changes like this one quite complicated.

theotherjimmy · 2018-01-24T17:42:14Z

I think the "right solution" will have to be relpath(dirnname(scatter_file), resources.file_basepath[scatter_file]), and the resources object will have to be passed in.

hosse005 · 2018-01-24T18:47:41Z

@theotherjimmy , I may need some help with this one then, not sure how to do this.

theotherjimmy · 2018-01-31T21:57:12Z

@hosse005 I think that'll do everything I need it to; offline, online export and online compile. Sorry that took so long.

0xc0170 · 2018-02-01T09:58:31Z

/morph build

mbed-ci · 2018-02-01T10:33:11Z

Build : SUCCESS

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

Triggering tests

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

mbed-ci · 2018-02-01T13:32:15Z

Exporter Build : FAILURE

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

mbed-ci · 2018-02-01T14:55:56Z

Test : SUCCESS

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

0xc0170 · 2018-02-01T15:13:53Z

Exporters fail as we saw earlier for Cortex A targets, please review

restarting uvisor

/morph uvisor-test

orenc17 · 2018-02-01T16:18:05Z

/morph uvisor-test

cmonr · 2018-02-03T03:09:16Z

Dunno why results aren't being shown. Rebuilding.

/morph build

mbed-ci · 2018-02-03T03:40:15Z

Build : SUCCESS

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

Triggering tests

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

mbed-ci · 2018-02-03T06:37:42Z

Exporter Build : SUCCESS

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

mbed-ci · 2018-02-03T06:44:37Z

Test : SUCCESS

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

ARM: ARMC6: Specify CPU for ARM scatter file preprocessor

453a1d7

Fixes ARMmbed#5796

0xc0170 requested a review from theotherjimmy January 6, 2018 12:46

0xc0170 added the needs: review label Jan 6, 2018

theotherjimmy approved these changes Jan 8, 2018

View reviewed changes

theotherjimmy added needs: CI and removed needs: review labels Jan 8, 2018

ARM: ARMC6: Fix for ARM linker script cpu formatting

3c21f1e

theotherjimmy changed the title ~~ARM: ARMC6: Specify CPU for ARM scatter file preprocessor~~ ARMC6: Specify CPU for ARM scatter file preprocessor Jan 8, 2018

theotherjimmy changed the title ~~ARMC6: Specify CPU for ARM scatter file preprocessor~~ ARMC5+6: Specify CPU for ARM scatter file preprocessor Jan 8, 2018

0xc0170 added needs: work and removed needs: CI labels Jan 9, 2018

ARM: ARMC6: Copy headers along with the updated linker scatter file

6b21a55

* Need to copy headers into the build directory as well when also writing an updated linker scatter file to the build directory

0xc0170 added needs: CI and removed needs: work labels Jan 12, 2018

cmonr added needs: work and removed needs: CI labels Jan 23, 2018

Use relative path to scatter for include path

9b8ba4d

theotherjimmy force-pushed the master branch from 9f681e9 to 9b8ba4d Compare February 2, 2018 17:54

cmonr added needs: CI and removed needs: work labels Feb 3, 2018

cmonr added ready for merge and removed needs: CI labels Feb 3, 2018

cmonr merged commit 779ee84 into ARMmbed:master Feb 7, 2018

cmonr added release-version: 5.7.5 and removed ready for merge labels Feb 7, 2018

ARMC5+6: Specify CPU for ARM scatter file preprocessor #5797

ARMC5+6: Specify CPU for ARM scatter file preprocessor #5797

Uh oh!

Conversation

hosse005 commented Jan 5, 2018

Description

Status

Migrations

Steps to test or reproduce

Uh oh!

hosse005 commented Jan 5, 2018

Uh oh!

theotherjimmy left a comment

Choose a reason for hiding this comment

Uh oh!

hosse005 commented Jan 8, 2018

Uh oh!

0xc0170 commented Jan 8, 2018

Uh oh!

hosse005 commented Jan 8, 2018

Uh oh!

0xc0170 commented Jan 9, 2018

Uh oh!

mbed-ci commented Jan 9, 2018

Uh oh!

0xc0170 commented Jan 9, 2018

Uh oh!

hosse005 commented Jan 9, 2018

Uh oh!

0xc0170 commented Jan 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hosse005 commented Jan 10, 2018

Uh oh!

0xc0170 commented Jan 11, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hosse005 commented Jan 11, 2018

Uh oh!

0xc0170 commented Jan 12, 2018

Uh oh!

0xc0170 commented Jan 12, 2018

Uh oh!

mbed-ci commented Jan 12, 2018

Triggering tests

Uh oh!

mbed-ci commented Jan 12, 2018

Uh oh!

mbed-ci commented Jan 23, 2018

Uh oh!

hosse005 commented Jan 23, 2018

Uh oh!

theotherjimmy commented Jan 23, 2018

Uh oh!

mbed-ci commented Jan 23, 2018

Uh oh!

hosse005 commented Jan 24, 2018

Uh oh!

theotherjimmy commented Jan 24, 2018

Uh oh!

theotherjimmy commented Jan 24, 2018

Uh oh!

hosse005 commented Jan 24, 2018

Uh oh!

theotherjimmy commented Jan 31, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xc0170 commented Feb 1, 2018

Uh oh!

mbed-ci commented Feb 1, 2018

Triggering tests

Uh oh!

mbed-ci commented Feb 1, 2018

Uh oh!

mbed-ci commented Feb 1, 2018

Uh oh!

0xc0170 commented Feb 1, 2018

Uh oh!

orenc17 commented Feb 1, 2018

Uh oh!

0xc0170 commented Jan 10, 2018 •

edited

Loading

0xc0170 commented Jan 11, 2018 •

edited

Loading

theotherjimmy commented Jan 31, 2018 •

edited

Loading