From aaeb0a672ecf31e2e776fc141bf1e26b7835c3a3 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard@teslabs.com>
Date: Thu, 14 Sep 2023 11:47:58 +0200
Subject: [PATCH] toolchain: only include <zephyr/toolchain.h>

It is wrong to use toolchain-specific header files.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
---
 drivers/adc/adc_stm32.c                                         | 2 +-
 soc/arm/aspeed/aspeed_util.h                                    | 2 +-
 soc/riscv/espressif_esp32/esp32c3/soc.c                         | 2 +-
 soc/riscv/espressif_esp32/esp32c3/soc_irq.c                     | 2 +-
 soc/xtensa/espressif_esp32/esp32/soc.c                          | 2 +-
 soc/xtensa/espressif_esp32/esp32_net/soc.c                      | 2 +-
 soc/xtensa/espressif_esp32/esp32s2/soc.c                        | 2 +-
 soc/xtensa/espressif_esp32/esp32s3/soc.c                        | 2 +-
 subsys/usb/device_next/usbd_class.c                             | 2 +-
 subsys/usb/device_next/usbd_core.c                              | 2 +-
 tests/bsim/bluetooth/host/adv/resume/src/dut.c                  | 2 +-
 tests/bsim/bluetooth/host/gatt/settings/src/client.c            | 2 +-
 tests/bsim/bluetooth/host/gatt/settings/src/server.c            | 2 +-
 tests/bsim/bluetooth/host/privacy/central/src/tester.c          | 2 +-
 tests/bsim/bluetooth/host/privacy/peripheral/src/dut.c          | 2 +-
 .../host/security/bond_overwrite_allowed/src/peripheral.c       | 2 +-
 .../host/security/bond_overwrite_denied/src/peripheral.c        | 2 +-
 .../host/security/bond_per_connection/src/peripheral.c          | 2 +-
 .../host/security/id_addr_update/peripheral/src/peripheral.c    | 2 +-
 west.yml                                                        | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c
index 4bff19ce57c..ad8fcdcb1fd 100644
--- a/drivers/adc/adc_stm32.c
+++ b/drivers/adc/adc_stm32.c
@@ -27,7 +27,7 @@
 #ifdef CONFIG_ADC_STM32_DMA
 #include <zephyr/drivers/dma/dma_stm32.h>
 #include <zephyr/drivers/dma.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <stm32_ll_dma.h>
 #endif
 
diff --git a/soc/arm/aspeed/aspeed_util.h b/soc/arm/aspeed/aspeed_util.h
index 27a4a504e78..c1b656aeaee 100644
--- a/soc/arm/aspeed/aspeed_util.h
+++ b/soc/arm/aspeed/aspeed_util.h
@@ -7,7 +7,7 @@
 #define ZEPHYR_SOC_ARM_ASPEED_UTIL_H_
 #include <zephyr/sys/util.h>
 #include <zephyr/devicetree.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 
 /* gcc.h doesn't define __section but checkpatch.pl will complain for this. so
  * temporarily add a macro here.
diff --git a/soc/riscv/espressif_esp32/esp32c3/soc.c b/soc/riscv/espressif_esp32/esp32c3/soc.c
index be94280a96a..8bb32a5febd 100644
--- a/soc/riscv/espressif_esp32/esp32c3/soc.c
+++ b/soc/riscv/espressif_esp32/esp32c3/soc.c
@@ -23,7 +23,7 @@
 #include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <string.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 #include <soc.h>
 
 #ifdef CONFIG_MCUBOOT
diff --git a/soc/riscv/espressif_esp32/esp32c3/soc_irq.c b/soc/riscv/espressif_esp32/esp32c3/soc_irq.c
index e1be1d23019..44c8161950c 100644
--- a/soc/riscv/espressif_esp32/esp32c3/soc_irq.c
+++ b/soc/riscv/espressif_esp32/esp32c3/soc_irq.c
@@ -18,7 +18,7 @@
 
 #include <zephyr/kernel_structs.h>
 #include <string.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 #include <soc.h>
 #include <zephyr/arch/riscv/arch.h>
 
diff --git a/soc/xtensa/espressif_esp32/esp32/soc.c b/soc/xtensa/espressif_esp32/esp32/soc.c
index 953c4797ce9..2abd0f6a88a 100644
--- a/soc/xtensa/espressif_esp32/esp32/soc.c
+++ b/soc/xtensa/espressif_esp32/esp32/soc.c
@@ -14,7 +14,7 @@
 
 #include <zephyr/kernel_structs.h>
 #include <string.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
 #include <zephyr/linker/linker-defs.h>
 #include <kernel_internal.h>
diff --git a/soc/xtensa/espressif_esp32/esp32_net/soc.c b/soc/xtensa/espressif_esp32/esp32_net/soc.c
index bec52472e3e..ac53ccb7e74 100644
--- a/soc/xtensa/espressif_esp32/esp32_net/soc.c
+++ b/soc/xtensa/espressif_esp32/esp32_net/soc.c
@@ -14,7 +14,7 @@
 
 #include <zephyr/kernel_structs.h>
 #include <string.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
 #include <zephyr/linker/linker-defs.h>
 #include <kernel_internal.h>
diff --git a/soc/xtensa/espressif_esp32/esp32s2/soc.c b/soc/xtensa/espressif_esp32/esp32s2/soc.c
index 9fc9701db52..45edde47178 100644
--- a/soc/xtensa/espressif_esp32/esp32s2/soc.c
+++ b/soc/xtensa/espressif_esp32/esp32s2/soc.c
@@ -15,7 +15,7 @@
 #include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <string.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
 
 #include "esp_private/system_internal.h"
diff --git a/soc/xtensa/espressif_esp32/esp32s3/soc.c b/soc/xtensa/espressif_esp32/esp32s3/soc.c
index 4d44fe2f004..617ee05aabb 100644
--- a/soc/xtensa/espressif_esp32/esp32s3/soc.c
+++ b/soc/xtensa/espressif_esp32/esp32s3/soc.c
@@ -14,7 +14,7 @@
 
 #include <zephyr/kernel_structs.h>
 #include <string.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
 #include <zephyr/linker/linker-defs.h>
 #include <kernel_internal.h>
diff --git a/subsys/usb/device_next/usbd_class.c b/subsys/usb/device_next/usbd_class.c
index 407e9145258..64610fa3d53 100644
--- a/subsys/usb/device_next/usbd_class.c
+++ b/subsys/usb/device_next/usbd_class.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/usb/usbd.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/drivers/usb/udc.h>
 #include <zephyr/sys/slist.h>
 #include <zephyr/sys/iterable_sections.h>
diff --git a/subsys/usb/device_next/usbd_core.c b/subsys/usb/device_next/usbd_core.c
index 5e68ccfcafa..e025397cc85 100644
--- a/subsys/usb/device_next/usbd_core.c
+++ b/subsys/usb/device_next/usbd_core.c
@@ -7,7 +7,7 @@
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/sys/slist.h>
 #include <zephyr/sys/iterable_sections.h>
 #include <zephyr/drivers/usb/udc.h>
diff --git a/tests/bsim/bluetooth/host/adv/resume/src/dut.c b/tests/bsim/bluetooth/host/adv/resume/src/dut.c
index fac6d919e24..40e4612b04d 100644
--- a/tests/bsim/bluetooth/host/adv/resume/src/dut.c
+++ b/tests/bsim/bluetooth/host/adv/resume/src/dut.c
@@ -8,7 +8,7 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bsim/bluetooth/host/gatt/settings/src/client.c b/tests/bsim/bluetooth/host/gatt/settings/src/client.c
index 8720fdea219..fc33f17bd4b 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/src/client.c
+++ b/tests/bsim/bluetooth/host/gatt/settings/src/client.c
@@ -11,7 +11,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/settings/settings.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bsim/bluetooth/host/gatt/settings/src/server.c b/tests/bsim/bluetooth/host/gatt/settings/src/server.c
index 9457febc5d4..7fff0f72c15 100644
--- a/tests/bsim/bluetooth/host/gatt/settings/src/server.c
+++ b/tests/bsim/bluetooth/host/gatt/settings/src/server.c
@@ -12,7 +12,7 @@
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/settings/settings.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bsim/bluetooth/host/privacy/central/src/tester.c b/tests/bsim/bluetooth/host/privacy/central/src/tester.c
index d511202c450..1c29b53e0c4 100644
--- a/tests/bsim/bluetooth/host/privacy/central/src/tester.c
+++ b/tests/bsim/bluetooth/host/privacy/central/src/tester.c
@@ -12,7 +12,7 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 
 DEFINE_FLAG(flag_new_address);
 
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/dut.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/dut.c
index 6446545d72a..3000a3e0f9e 100644
--- a/tests/bsim/bluetooth/host/privacy/peripheral/src/dut.c
+++ b/tests/bsim/bluetooth/host/privacy/peripheral/src/dut.c
@@ -12,7 +12,7 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 
 #include "common/bt_str.h"
 
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c
index e0e6a81fe93..633768879d3 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_allowed/src/peripheral.c
@@ -8,7 +8,7 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c
index c6baf98c689..319779c94f1 100644
--- a/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/bond_overwrite_denied/src/peripheral.c
@@ -8,7 +8,7 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c b/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c
index 8cd01f194ec..9b368cce26e 100644
--- a/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/bond_per_connection/src/peripheral.c
@@ -8,7 +8,7 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c
index bbdfc055021..5420fdf0dd4 100644
--- a/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c
+++ b/tests/bsim/bluetooth/host/security/id_addr_update/peripheral/src/peripheral.c
@@ -9,7 +9,7 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/conn.h>
-#include <zephyr/toolchain/gcc.h>
+#include <zephyr/toolchain.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/west.yml b/west.yml
index f0005c12d4d..5a39a5d2e0f 100644
--- a/west.yml
+++ b/west.yml
@@ -193,7 +193,7 @@ manifest:
       groups:
         - hal
     - name: hal_nxp
-      revision: 06c956741a81eb0fd3c0c31367c3c177bffaaab8
+      revision: 5331fe2ff1310b033bf01cd3a232f1e587726e3b
       path: modules/hal/nxp
       groups:
         - hal