Skip to content

Commit 0223bfe

Browse files
committed
Merge branch 'feature/update-toolchain-to-esp-15.1.0_20250607' into 'master'
feat(tools): update toolchain version to esp-15.1.0_20250607 See merge request espressif/esp-idf!39728
2 parents c976203 + 0a07021 commit 0223bfe

File tree

81 files changed

+659
-350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+659
-350
lines changed

CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,10 @@ if(CONFIG_COMPILER_DUMP_RTL_FILES)
169169
list(APPEND compile_options "-fdump-rtl-expand")
170170
endif()
171171

172+
if(CMAKE_C_COMPILER_ID MATCHES "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 15.0)
173+
list(APPEND c_compile_options "-fzero-init-padding-bits=all" "-fno-malloc-dce")
174+
endif()
175+
172176
__generate_prefix_map(prefix_map_compile_options)
173177
list(APPEND compile_options ${prefix_map_compile_options})
174178

@@ -188,6 +192,15 @@ if(CONFIG_COMPILER_DISABLE_GCC14_WARNINGS)
188192
list(APPEND compile_options "-Wno-calloc-transposed-args")
189193
endif()
190194

195+
if(CONFIG_COMPILER_DISABLE_GCC15_WARNINGS)
196+
list(APPEND c_compile_options "-Wno-unterminated-string-initialization")
197+
list(APPEND c_compile_options "-Wno-header-guard")
198+
list(APPEND cxx_compile_options "-Wno-self-move")
199+
list(APPEND cxx_compile_options "-Wno-template-body")
200+
list(APPEND cxx_compile_options "-Wno-dangling-reference")
201+
list(APPEND cxx_compile_options "-Wno-defaulted-function-deleted")
202+
endif()
203+
191204
if(CONFIG_COMPILER_DISABLE_DEFAULT_ERRORS)
192205
if(NOT CMAKE_C_COMPILER_ID MATCHES "Clang")
193206
idf_build_replace_option_from_property(COMPILE_OPTIONS "-Werror" "-Werror=all")

Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,13 @@ mainmenu "Espressif IoT Development Framework Configuration"
610610
Enable this option if use GCC 14 or newer, and want to disable warnings which don't appear with
611611
GCC 13.
612612

613+
config COMPILER_DISABLE_GCC15_WARNINGS
614+
bool "Disable new warnings introduced in GCC 15"
615+
default "n"
616+
help
617+
Enable this option if use GCC 15 or newer, and want to disable warnings which don't appear with
618+
GCC 14.
619+
613620
config COMPILER_DUMP_RTL_FILES
614621
bool "Dump RTL files during compilation"
615622
help

components/bootloader_support/src/bootloader_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ esp_image_header_t WORD_ALIGNED_ATTR bootloader_image_hdr;
2929

3030
void bootloader_clear_bss_section(void)
3131
{
32-
memset(&_bss_start, 0, (&_bss_end - &_bss_start) * sizeof(_bss_start));
32+
memset(&_bss_start, 0, (uintptr_t)&_bss_end - (uintptr_t)&_bss_start);
3333
}
3434

3535
esp_err_t bootloader_read_bootloader_header(void)

components/bt/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,3 +1022,14 @@ if(NOT CMAKE_BUILD_EARLY_EXPANSION)
10221022
"${CMAKE_CURRENT_LIST_DIR}/host/bluedroid/btc/profile/std/gap/btc_gap_ble.c"
10231023
PROPERTIES COMPILE_FLAGS "${jump_table_opts}")
10241024
endif()
1025+
1026+
if(CMAKE_C_COMPILER_ID MATCHES "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 15.0)
1027+
if(CONFIG_BT_BLUEDROID_ENABLED)
1028+
set_source_files_properties("host/bluedroid/device/controller.c"
1029+
PROPERTIES COMPILE_FLAGS "-Wno-unterminated-string-initialization")
1030+
endif()
1031+
if(CONFIG_BT_NIMBLE_ENABLED AND CONFIG_BT_NIMBLE_MESH)
1032+
set_source_files_properties("host/nimble/nimble/nimble/host/mesh/src/prov.c"
1033+
PROPERTIES COMPILE_FLAGS "-Wno-unterminated-string-initialization")
1034+
endif()
1035+
endif()

components/bt/host/bluedroid/btc/profile/std/a2dp/bta_av_co.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* BTC.
2323
*
2424
******************************************************************************/
25+
#include "esp_attr.h"
2526
#include "string.h"
2627
#include "common/bt_target.h"
2728
#include "stack/a2d_api.h"
@@ -66,7 +67,7 @@
6667
#define BTA_AV_CO_SBC_MAX_BITPOOL 53
6768

6869
/* SCMS-T protect info */
69-
const UINT8 bta_av_co_cp_scmst[BTA_AV_CP_INFO_LEN] = "\x02\x02\x00";
70+
const UINT8 bta_av_co_cp_scmst[BTA_AV_CP_INFO_LEN] = { 2, 2, 0 };
7071

7172
/* SBC SRC codec capabilities */
7273
const tA2D_SBC_CIE bta_av_co_sbc_caps = {

components/cxx/test_apps/.build-test-rules.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
components/cxx/test_apps:
44
enable:
5-
- if: IDF_TARGET in ["esp32", "esp32c3"]
5+
- if: IDF_TARGET in ["esp32", "esp32c3", "esp32c61", "esp32p4"]
66
temporary: true
77
reason: the other targets are not tested yet
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| Supported Targets | ESP32 | ESP32-C3 |
2-
| ----------------- | ----- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C3 | ESP32-C61 | ESP32-P4 |
2+
| ----------------- | ----- | -------- | --------- | -------- |

components/cxx/test_apps/exception/main/test_exception.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -13,12 +13,10 @@
1313
- 88 bytes are allocated by pthread_setspecific() to init internal lock
1414
- some more memory...
1515
*/
16-
#if CONFIG_IDF_TARGET_ESP32
17-
#define LEAKS (300)
18-
#elif CONFIG_IDF_TARGET_ESP32S2
19-
#define LEAKS (800)
20-
#elif CONFIG_IDF_TARGET_ESP32C3
21-
#define LEAKS (700)
16+
#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C61 || CONFIG_IDF_TARGET_ESP32P4
17+
#define LEAKS (128) /* real: 72 */
18+
#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32C3
19+
#define LEAKS (448) /* real: 396 */
2220
#else
2321
#error "unknown target in CXX tests, can't set leaks threshold"
2422
#endif

components/cxx/test_apps/exception/pytest_cxx_exception.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77

88
@pytest.mark.generic
9-
@idf_parametrize('target', ['esp32', 'esp32c3'], indirect=['target'])
9+
@idf_parametrize('target', ['esp32', 'esp32c3', 'esp32c61', 'esp32p4'], indirect=['target'])
1010
def test_cxx_exception(dut: Dut) -> None:
1111
dut.run_all_single_board_cases()
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| Supported Targets | ESP32 | ESP32-C3 |
2-
| ----------------- | ----- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C3 | ESP32-C61 | ESP32-P4 |
2+
| ----------------- | ----- | -------- | --------- | -------- |

0 commit comments

Comments
 (0)