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

Jump to bottom

rtos: branch compiler_attributes.h for XTOS and Zephyr #9489

Merged
merged 1 commit into from
Sep 19, 2024
Merged

rtos: branch compiler_attributes.h for XTOS and Zephyr #9489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 4 additions & 14 deletions xtos/include/sof/compiler_attributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,8 @@
* Author: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
*/

#ifdef __ZEPHYR__

#include <zephyr/toolchain.h>

/* Get __sparse_cache and __sparse_force definitions if __CHECKER__ is defined */
#include <zephyr/debug/sparse.h>

#else
#ifndef __SOF_COMPILER_ATTRIBUTES_H__
#define __SOF_COMPILER_ATTRIBUTES_H__

#define __sparse_cache
#define __sparse_force
Expand All @@ -25,8 +19,6 @@
#define __unused __attribute__((unused))
#endif

#endif

#ifndef __aligned
#define __aligned(x) __attribute__((__aligned__(x)))
#endif
Expand All @@ -44,11 +36,9 @@
*/
#if ((defined(__GNUC__) && (__GNUC__ >= 7)) || \
(defined(__clang__) && (__clang_major__ >= 10))) && !defined(__CHECKER__)

#define COMPILER_FALLTHROUGH __attribute__((fallthrough))

#else

#define COMPILER_FALLTHROUGH /* fallthrough */

#endif

#endif /* __SOF_COMPILER_ATTRIBUTES_H__ */
36 changes: 36 additions & 0 deletions zephyr/include/sof/compiler_attributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright(c) 2024 Intel Corporation.
*/

#ifndef __SOF_COMPILER_ATTRIBUTES_H__
#define __SOF_COMPILER_ATTRIBUTES_H__

#include <zephyr/toolchain.h>

/* Get __sparse_cache and __sparse_force definitions if __CHECKER__ is defined */
#include <zephyr/debug/sparse.h>

#ifndef __aligned
#define __aligned(x) __attribute__((__aligned__(x)))
#endif

#ifndef __section
#define __section(x) __attribute__((section(x)))
#endif

/* The fallthrough attribute is supported since GCC 7.0
* and Clang 10.0.0.
*
* Note that Clang sets __GNUC__ == 4 so the GCC version
* test will not be true here, and must go through
* the Clang version test.
*/
#if ((defined(__GNUC__) && (__GNUC__ >= 7)) || \
(defined(__clang__) && (__clang_major__ >= 10))) && !defined(__CHECKER__)
#define COMPILER_FALLTHROUGH __attribute__((fallthrough))
#else
#define COMPILER_FALLTHROUGH /* fallthrough */
#endif

#endif /* __SOF_COMPILER_ATTRIBUTES_H__ */
Loading