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

RTEMS.cmake: add quotes around ${RTEMS_BSP_C_FLAGS}. #395

Merged
merged 1 commit into from
Sep 1, 2023

Conversation

Jkillelea
Copy link
Contributor

@Jkillelea Jkillelea commented Jun 29, 2023

Without the quotes, only the first argument is actually passed to the compiler by rtems-syms.

Checklist (Please check before submitting)

Describe the contribution
A clear and concise description of what the contribution is.

  • This change ensures that all flags from RTEMS_BSP_C_FLAGS are passed from rtems-syms to the compiler.

Testing performed
Steps taken to test the contribution:

  1. Only tested to check if compilation succeeds.

Expected behavior changes
A clear and concise description of how this contribution will change behavior and level of impact.

  • API Change: N/A
  • Behavior Change: xxx (if applicable)

Before: The only flag that rtems-syms passes to the compiler is -march=armv7-a. This causes a crash because the compiler assumes the wrong floating point ABI.

/home/jacob/projects/rtems/6/bin/rtems-syms -vvv -e -c -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard -mtune=cortex-a7 -fno-common -fdata-sections -ffunction-sections -C /home/jacob/projects/rtems/6/bin/arm-rtems6-gcc -o cmTC_56657.exe-dl-sym.o cmTC_56657.exe-prelink
    RTEMS Kernel Symbols 6.ac1fee4f04fe
    kernel: cmTC_56657.exe-prelink
    cache:load-sym: object files: 1
    cache:load-sym: symbols: 1459
    Filtered symbols: 1074
    symbol C file: /tmp/ccaneeaa.c
    symbol O file: cmTC_56657.exe-dl-sym.o
    execute: /home/jacob/projects/rtems/6/bin/arm-rtems6-gcc -march=armv7-a -O2 -c -o cmTC_56657.exe-dl-sym.o /tmp/ccaneeaa.c 

After: All flags are correctly passed to the compiler. The floating point ABI is correctly specified.

/home/jacob/projects/rtems/6/bin/rtems-syms -vvv -e -c "-march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard -mtune=cortex-a7 -fno-common -fdata-sections -ffunction-sections" -C /home/jacob/projects/rtems/6/bin/arm-rtems6-gcc -o cmTC_ed3ae.exe-dl-sym.o cmTC_ed3ae.exe-prelink
RTEMS Kernel Symbols 6.ac1fee4f04fe
kernel: cmTC_ed3ae.exe-prelink
cache:load-sym: object files: 1
cache:load-sym: symbols: 1463
Filtered symbols: 1075
symbol C file: /tmp/ccNoeeaa.c
symbol O file: cmTC_ed3ae.exe-dl-sym.o
execute: /home/jacob/projects/rtems/6/bin/arm-rtems6-gcc -march=armv7-a -mthumb -mfpu=neon -mfloat-abi=hard -mtune=cortex-a7 -fno-common -fdata-sections -ffunction-sections -O2 -c -o cmTC_ed3ae.exe-dl-sym.o /tmp/ccNoeeaa.c 

System(s) tested on

  • Hardware: Raspberry Pi 3.
  • OS: Building on Ubuntu 22.04 for RTEMS 6.
  • Versions: PSP draco-rc4.

Additional context
N/A

Third party code
N/A

Contributor Info - All information REQUIRED for consideration of pull request
Full name and company/organization/center of all contributors ("Personal" if individual work)

  • Jacob Killelea / Personal

Without the quotes, only the first argument is actually passed to the
compiler by rtems-syms.
@dzbaker dzbaker added the CCB:Approved Indicates Approval by CCB label Jul 20, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Sep 1, 2023
*Combines:*

cFE v7.0.0-rc4+dev384
psp v1.6.0-rc4+dev90
osal v6.0.0-rc4+dev229
elf2cfetbl v3.3.0-rc4+dev36
ci_lab v2.5.0-rc4+dev47

**Includes:**

*cFE*
- nasa/cFE#2401
- nasa/cFE#2403
- nasa/cFE#2380
- nasa/cFE#2400
- nasa/cFE#2420

*psp*
- nasa/PSP#395
- nasa/PSP#400

*osal*
- nasa/osal#1409

*elf2cfetbl*
- nasa/elf2cfetbl#137
- nasa/elf2cfetbl#136

*ci_lab*
- nasa/ci_lab#143

Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com>
Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Jacob Killelea <jkillelea@users.noreply.github.com>
Co-authored by: Dylan Z. Baker <dzbaker@users.noreply.github.com>
@dzbaker dzbaker mentioned this pull request Sep 1, 2023
2 tasks
dzbaker added a commit to nasa/cFS that referenced this pull request Sep 1, 2023
*Combines:*

cFE v7.0.0-rc4+dev384
psp v1.6.0-rc4+dev90
osal v6.0.0-rc4+dev229
elf2cfetbl v3.3.0-rc4+dev36
ci_lab v2.5.0-rc4+dev47

**Includes:**

*cFE*
- nasa/cFE#2401
- nasa/cFE#2403
- nasa/cFE#2380
- nasa/cFE#2400
- nasa/cFE#2420

*psp*
- nasa/PSP#395
- nasa/PSP#400

*osal*
- nasa/osal#1409

*elf2cfetbl*
- nasa/elf2cfetbl#137
- nasa/elf2cfetbl#136

*ci_lab*
- nasa/ci_lab#143

Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com>
Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Jacob Killelea <jkillelea@users.noreply.github.com>
Co-authored by: Dylan Z. Baker <dzbaker@users.noreply.github.com>
dzbaker added a commit to nasa/cFS that referenced this pull request Sep 1, 2023
*Combines:*

cFE v7.0.0-rc4+dev384
psp v1.6.0-rc4+dev90
osal v6.0.0-rc4+dev229
elf2cfetbl v3.3.0-rc4+dev36
ci_lab v2.5.0-rc4+dev47

**Includes:**

*cFE*
- nasa/cFE#2401
- nasa/cFE#2403
- nasa/cFE#2380
- nasa/cFE#2400
- nasa/cFE#2420

*psp*
- nasa/PSP#395
- nasa/PSP#400

*osal*
- nasa/osal#1409

*elf2cfetbl*
- nasa/elf2cfetbl#137
- nasa/elf2cfetbl#136

*ci_lab*
- nasa/ci_lab#143

Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com>
Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Jacob Killelea <jkillelea@users.noreply.github.com>
Co-authored by: Dylan Z. Baker <dzbaker@users.noreply.github.com>
dzbaker added a commit to nasa/cFS that referenced this pull request Sep 1, 2023
*Combines:*

cFE v7.0.0-rc4+dev384
psp v1.6.0-rc4+dev90
osal v6.0.0-rc4+dev229
elf2cfetbl v3.3.0-rc4+dev36
ci_lab v2.5.0-rc4+dev47

**Includes:**

*cFE*
- nasa/cFE#2401
- nasa/cFE#2403
- nasa/cFE#2380
- nasa/cFE#2400
- nasa/cFE#2420

*psp*
- nasa/PSP#395
- nasa/PSP#400

*osal*
- nasa/osal#1409

*elf2cfetbl*
- nasa/elf2cfetbl#137
- nasa/elf2cfetbl#136

*ci_lab*
- nasa/ci_lab#143

Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com>
Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Jacob Killelea <jkillelea@users.noreply.github.com>
Co-authored by: Dylan Z. Baker <dzbaker@users.noreply.github.com>
@dzbaker dzbaker merged commit c092f69 into nasa:main Sep 1, 2023
9 of 10 checks passed
dzbaker added a commit to nasa/cFS that referenced this pull request Sep 1, 2023
*Combines:*

cFE v7.0.0-rc4+dev384
psp v1.6.0-rc4+dev90
osal v6.0.0-rc4+dev229
elf2cfetbl v3.3.0-rc4+dev36
ci_lab v2.5.0-rc4+dev47

**Includes:**

*cFE*
- nasa/cFE#2401
- nasa/cFE#2403
- nasa/cFE#2380
- nasa/cFE#2400
- nasa/cFE#2420

*psp*
- nasa/PSP#395
- nasa/PSP#400

*osal*
- nasa/osal#1409

*elf2cfetbl*
- nasa/elf2cfetbl#137
- nasa/elf2cfetbl#136

*ci_lab*
- nasa/ci_lab#143

Co-authored by: Justin Figueroa <chillfig@users.noreply.github.com>
Co-authored by: Jacob Hageman  <skliper@users.noreply.github.com>
Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Jacob Killelea <jkillelea@users.noreply.github.com>
Co-authored by: Dylan Z. Baker <dzbaker@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates Approval by CCB Equuleus-rc2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants