This is an archive of the discontinued LLVM Phabricator instance.

Differential D124969

[compiler-rt][AVR] Fix avr_SOURCES CMake variable
ClosedPublic

Authored by aykevl on May 4 2022, 3:54 PM.

Details

Reviewers
MaskRay
benshi001
Commits
rG514371c3706d: [compiler-rt][AVR] Fix avr_SOURCES CMake variable
Summary

D123200 did not include the generic sources, which means that only the AVR-specific sources were compiled. With this change, generic sources are included as expected.

Tested with the following commands:

cmake -G Ninja -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=avr -DCOMPILER_RT_BAREMETAL_BUILD=1 -DCMAKE_C_COMPILER=clang-14 -DCMAKE_C_FLAGS="--target=avr -mmcu=avr5 -nostdlibinc -mdouble=64" ../path/to/builtins
ninja

Diff Detail

Event Timeline

aykevl created this revision.May 4 2022, 3:54 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 4 2022, 3:54 PM
Herald added subscribers: StephenFan, Jim, abidh and 3 others. · View Herald Transcript
aykevl requested review of this revision.May 4 2022, 3:54 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 4 2022, 3:54 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B162808: Diff 427157.May 4 2022, 4:15 PM
MaskRay accepted this revision.May 4 2022, 4:36 PM

LGTM.

This revision is now accepted and ready to land.May 4 2022, 4:36 PM
Closed by commit rG514371c3706d: [compiler-rt][AVR] Fix avr_SOURCES CMake variable (authored by aykevl). · Explain WhyMay 4 2022, 5:29 PM
This revision was automatically updated to reflect the committed changes.
aykevl added a commit: rG514371c3706d: [compiler-rt][AVR] Fix avr_SOURCES CMake variable.

Revision Contents

PathSize
compiler-rt/
lib/
builtins/
1 line

Diff 427166

compiler-rt/lib/builtins/CMakeLists.txt

Show First 20 Lines • Show All 566 Lines • ▼ Show 20 Lines
set(armv8m.main_SOURCES ${arm_SOURCES}) set(armv8m.main_SOURCES ${arm_SOURCES})
set(armv8.1m.main_SOURCES ${arm_SOURCES}) set(armv8.1m.main_SOURCES ${arm_SOURCES})
# 8-bit AVR MCU # 8-bit AVR MCU
set(avr_SOURCES set(avr_SOURCES
avr/mulqi3.S avr/mulqi3.S
avr/mulhi3.S avr/mulhi3.S
avr/exit.S avr/exit.S
${GENERIC_SOURCES}
) )
# hexagon arch # hexagon arch
set(hexagon_SOURCES set(hexagon_SOURCES
hexagon/common_entry_exit_abi1.S hexagon/common_entry_exit_abi1.S
hexagon/common_entry_exit_abi2.S hexagon/common_entry_exit_abi2.S
hexagon/common_entry_exit_legacy.S hexagon/common_entry_exit_legacy.S
hexagon/dfaddsub.S hexagon/dfaddsub.S
▲ Show 20 Lines • Show All 238 Lines • Show Last 20 Lines