Skip to content

Commit 61fe69d

Browse files
marc-hbnashif
authored andcommitted
sys: device_mmio.h replace <toolchain/common.h> with <toolchain.h>
In include/sys/device_mmio.h, replacing <toolchain/common.h> fixes the following warning: $ west build -b qemu_x86 tests/arch/x86/static_idt/ In file included from zephyr/include/toolchain.h:50, from zephyr/include/linker/section_tags.h:12, from zephyr/include/linker/sections.h:132, from zephyr/include/sys/device_mmio.h:19, from zephyr/include/drivers/interrupt_controller/loapic.h:14, from zephyr/include/drivers/interrupt_controller/sysapic.h:10, from zephyr/include/arch/x86/arch.h:231, from zephyr/include/arch/cpu.h:15, from zephyr/tests/arch/x86/static_idt/src/test_stubs.S:17: zephyr/include/toolchain/gcc.h:61: error: BUILD_ASSERT redefined [-Werror] 61 | #define BUILD_ASSERT(EXPR, MSG...) _Static_assert(EXPR, "" MSG) | In file included from zephyr/include/sys/device_mmio.h:18, from zephyr/include/drivers/interrupt_controller/loapic.h:14, from zephyr/include/drivers/interrupt_controller/sysapic.h:10, from zephyr/include/arch/x86/arch.h:231, from zephyr/include/arch/cpu.h:15, from zephyr/tests/arch/x86/static_idt/src/test_stubs.S:17: zephyr/include/toolchain/common.h:165: note: this is the location of the previous definition 165 | #define BUILD_ASSERT(EXPR, MSG...) \ <toolchain.h> provides a compiler-specific BUILD_ASSERT. <toolchain/common.h> provides a generic, fallback BUILD_ASSERT and should probably never be included directly. Thanks to Gerard Marull-Paretas for recommending this fix. Related to commit af20208 ("devices: mark device MMIO declarations to boot/pinned sections") that added #include <linker/sections.h> Signed-off-by: Marc Herbert <marc.herbert@intel.com>
1 parent bd8cc59 commit 61fe69d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/sys/device_mmio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef ZEPHYR_INCLUDE_SYS_DEVICE_MMIO_H
1616
#define ZEPHYR_INCLUDE_SYS_DEVICE_MMIO_H
1717

18-
#include <toolchain/common.h>
18+
#include <toolchain.h>
1919
#include <linker/sections.h>
2020

2121
/**

0 commit comments

Comments
 (0)