Skip to content
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

Fix build error for MSP430 and Cortex A with IAR #937

Merged
merged 2 commits into from
Dec 29, 2023

Conversation

jefftenney
Copy link
Contributor

@jefftenney jefftenney commented Dec 27, 2023

Description

Fix a build error in the MSP430 and Cortex A IAR ports caused by whitespace missing in asm macros. Add whitespace to make sure all instruction mnemonics and assembler directives do not appear in the label field (column 1) of the line.

Test Steps

Build the msp430_IAR demo with and without this PR. When building without this PR, the assembler gives the error "Error[14]: Missing #endif" for both serialASM.s43 and portext.s43. When building with this PR, no error.

Note I did not test the Cortex A ports. I don't have the IAR compiler/assembler for Cortex A.

Checklist:

  • I have tested my changes. No regression in existing tests.
  • I have modified and/or added unit-tests to cover the code changes in this Pull Request. (N/A)

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@jefftenney jefftenney requested a review from a team as a code owner December 27, 2023 19:24
@jefftenney
Copy link
Contributor Author

jefftenney commented Dec 27, 2023

For perspective, #768 introduced the whitespace issue being fixed in this PR. Most of the other issues caused by #768 have already been resolved. However, these two files have similar issues not yet resolved:

https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/V11.0.1/portable/IAR/ARM_CA9/portASM.h
https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/V11.0.1/portable/IAR/ARM_CA5_No_GIC/portASM.h

I did not include those two files in this PR because I don't have the IAR Cortex A compiler. Do you want me to revert those files in this PR even though I won't be able to test? EDIT: I went ahead and did a revert of those two files to pre #768.

Copy link

sonarcloud bot commented Dec 27, 2023

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

@jefftenney jefftenney changed the title Fix build error for MSP430 with IAR Fix build error for MSP430 and Cortex A with IAR Dec 27, 2023
Copy link

codecov bot commented Dec 28, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (58f0d36) 93.78% compared to head (1a889a9) 93.78%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #937   +/-   ##
=======================================
  Coverage   93.78%   93.78%           
=======================================
  Files           6        6           
  Lines        3186     3186           
  Branches      885      885           
=======================================
  Hits         2988     2988           
  Misses         91       91           
  Partials      107      107           
Flag Coverage Δ
unittests 93.78% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@AniruddhaKanhere
Copy link
Member

Thank you @jefftenney for taking the time to fix this port's files! Much appreciated.

Since it has the required approvals, I shall merge this PR now.

@AniruddhaKanhere AniruddhaKanhere merged commit 5544c78 into FreeRTOS:main Dec 29, 2023
16 checks passed
@jefftenney jefftenney deleted the fix-msp430-iar-build-error branch December 29, 2023 20:06
laroche pushed a commit to laroche/FreeRTOS-Kernel that referenced this pull request Apr 18, 2024
* Add IPv6 Demo (FreeRTOS#937)

* Add demo changes

* Update kernel and library paths

* Update main.c

* Run uncrustify

* Fix spell checker

* CI check file headers update

* Add IPv6/v4 UDP echo server with zero copy/non-zero copy versions

* Add VS proj file changes to include the UDP echo sample code

* readme update

---------

Co-authored-by: Tony Josi <tonyjosi@amazon.com>

* Update Backward Compatibility Flag (FreeRTOS#954)

* Update Backward Compatibility Flag

* Update FreeRTOS_GetUDPPayloadBuffer_ByIPType

* Update FreeRTOS_IPStart to FreeRTOS_IPInit_Multi

* Update Application APIs

* Remove ipconfigCOMPATIBLE_WITH_SINGLE

* Update Static Lib files (FreeRTOS#956)

* Update Static Lib files

* making vApplicationIPNetworkEventHook backward compatible in demos

* Update CI check file headers

---------

Co-authored-by: Tony Josi <tonyjosi@amazon.com>

* Add WinPCap NetworkInterface Changes (FreeRTOS#958)

* Update winpcap network interface

* Run uncrustify

* Update function to include NetworkInterface_t parameters

* Adding compatibility for xApplicationDNSQueryHook with latest dev branch for old demos (FreeRTOS#957)

* adding compatibility for xApplicationDNSQueryHook with latest dev branch

* adding tcp echo server source

* removing unused sub demos

* fix build issues (FreeRTOS#969)

* Update demo to latest +TCP dev/IPv6_integration (FreeRTOS#978)

* remove macro namings

* rename sin_addr to sin_address.ulIP_IPv4 for ipv6 demo

* replace in6addr_any with FreeRTOS_in6addr_any

* replace mainCREATE_UDP_ECHO_SERVER_TASK with mainCREATE_UDP_ECHO_TASKS_SINGLE

* handle removal of sin_addr macro to sin_address.ulIP_IPv4

* updating +TCP repo to latest dev/IPv6_integration

* minor update to more clear code

* more sin_addr to sin_address.ulIP_IPv4 replacements

* fix makefiles for qemu and posix demos

* review feedback changes

* Update FreeRTOS-Plus-TCP for RC2

* Change from PR (FreeRTOS#994)

* Update FreeRTOS-Plus-TCP for RC2

* Update copyright

* Ignore WinPCap for files header check failure.

* Update checker

* Update manifest

* Point manifest to latest commit

* Fix Spell-checker

* Update doxygen

* Update xApplicationDHCPHook for backward compatibility  (FreeRTOS#999)

* Update xApplicationDHCPHook for backward compatability

* Update IPv6

* Update VisualStudio Static Project files

* Update pxEndPoint error (FreeRTOS#1002)

* Update IPv6 demo ReadMe (FreeRTOS#1004)

* Update ReadMe

* Update setup requirement

* Update UDP demo info

* Update comment

* TCP demo changes post build separation (FreeRTOS#1011)

* adding sin_family to dest adddr for FreeRTOS_sendto

* updating FreeRTOS_bind to input sin_family post build separation changes

* updating FreeRTOS_connect to input sin_family post build separation changes

* minor fix

* updating copyright year

* updating file headers

* updating +TCP submodule

* updating file headers

* updating file headers

* updating manifest file to have latest +TCP submodule hash

* Fix issue with posix demo while running with ipconfigIPv4_BACKWARD_COMPATIBLE enabled for +TCP stack (FreeRTOS#1027)

* Update the submodule pointer to IPv6 main

* Update manifest with latest TCP commit

* Update file checker exception

* Ignore Visual studio project file from file header checker

---------

Co-authored-by: Tony Josi <tonyjosi@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants