Skip to content

FPU_USED to be set based on HW FPU support + Squash commits #9437

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 3 commits into from
Jan 24, 2019

Conversation

deepikabhavnani
Copy link

Description

New Commit - __FPU_USED to be set based on HW FPU support
__FPU_USED flag is not set by compiler or tools, instead it should be
enabled based on HW FPU flags as done in "cmsis/TARGET_CORTEX_M/core_armv8mml.h"

Additional changes - Revert old CMSIS/RTX commits for pre-processor flags to create one single commit for importer script entry

Pull request type

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

Reviewers

Deepika and others added 3 commits January 18, 2019 17:31
1. Revert "CMSIS/RTX: __FPU_USED to be set based on HW FPU support"
This reverts commit b4f5bed7e75c21927c954a50d40422b81a1de5a0.

2. Revert "CMSIS/RTX: Update Armv8M IAR 8.x assembly files - add END"
This reverts commit b228cd9.

3. Revert "CMSIS/RTX: Pre-processor defines used for assembly"
This reverts commit 287121f.

4. Revert "CMSIS/RTX: Patch RTX so irq_cm4f.s files work with no FPU targets"
This reverts commit cc2e051.
CMSIS repo does not support pre-processor defines, hence multiple assembly
files are added for secure/non-secure and floating point tools.
Mbed OS tools support assembly file pre-processing, but the build system
does not support multiple assembly files for each target, hence updating
the assembly files.

1. Patch RTX so irq_cm4f.S files work with no FPU targets
2. Patch RTX so irq_armv8mml.S files to work with and without FPU
2. Patch RTX so irq_armv8mml.S and irq_armv8mbl.S files to work with secure and
   non-secure builds
@deepikabhavnani deepikabhavnani changed the title Preprocess asm FPU_USED to be set based on HW FPU support + Squash commits Jan 19, 2019
@ciarmcom
Copy link
Member

@deepikabhavnani, thank you for your changes.
@ARMmbed/mbed-os-tools @ARMmbed/mbed-os-core @ARMmbed/mbed-os-maintainers please review.

@ciarmcom ciarmcom requested review from a team January 19, 2019 02:00
Copy link
Contributor

@bridadan bridadan left a comment

Choose a reason for hiding this comment

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

I think tools got tagged because of the json changes. I trust you checked those commits 👍

@cmonr
Copy link
Contributor

cmonr commented Jan 23, 2019

CI started

@mbed-ci
Copy link

mbed-ci commented Jan 23, 2019

Test run: FAILED

Summary: 1 of 8 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_build-ARMC6

@alekla01
Copy link
Contributor

Restarted CI

@mbed-ci
Copy link

mbed-ci commented Jan 23, 2019

Test run: FAILED

Summary: 1 of 12 test jobs failed
Build number : 2
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_greentea-test

@cmonr cmonr merged commit 7bdc280 into ARMmbed:master Jan 24, 2019
@adbridge
Copy link
Contributor

This is sitting on top of #8887 scheduled for 5.12

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.