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.

Sign up for GitHub

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

xcc: fix k_poll event initializer and remove intel_s1000 log/ztest fixups #33689

Merged
merged 2 commits into from
Mar 26, 2021
Merged

xcc: fix k_poll event initializer and remove intel_s1000 log/ztest fixups #33689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e11bf55
soc: intel_s1000: remove log and ztest XCC fixes
dcpleung Mar 24, 2021
7348cb5
kernel: fix XCC compilation with k_poll event initializer
dcpleung Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions include/kernel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5228,7 +5228,9 @@ struct k_poll_event {
.state = K_POLL_STATE_NOT_READY, \
.mode = _event_mode, \
.unused = 0, \
.obj = _event_obj, \
{ \
.obj = _event_obj, \
}, \
}

#define K_POLL_EVENT_STATIC_INITIALIZER(_event_type, _event_mode, _event_obj, \
Expand All @@ -5239,7 +5241,9 @@ struct k_poll_event {
.state = K_POLL_STATE_NOT_READY, \
.mode = _event_mode, \
.unused = 0, \
.obj = _event_obj, \
{ \
.obj = _event_obj, \
}, \
}

/**
Expand Down
7 changes: 0 additions & 7 deletions soc/xtensa/intel_s1000/xcc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,3 @@

zephyr_library_sources_ifdef(CONFIG_CPLUSPLUS cpp_fixes.c)
zephyr_library_sources_ifdef(CONFIG_NEWLIB_LIBC newlib_fixes.c)

if(NOT (CC STREQUAL "clang"))
# These two are due to IS_ENABLED() not being parsed correctly
# in old GCC 4.2 based XCC. Clang is not affected.
zephyr_library_sources_ifdef(CONFIG_LOG_MINIMAL log_minimal_fixes.c)
zephyr_library_sources_ifdef(CONFIG_TEST ztest_fixes.c)
endif()
105 changes: 0 additions & 105 deletions soc/xtensa/intel_s1000/xcc/log_minimal_fixes.c
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions soc/xtensa/intel_s1000/xcc/ztest_fixes.c
View file
Open in desktop

This file was deleted.