alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-10 18:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/embed_file_symbol_names' into 'master'

Browse Source 
cmake: fix C identifier generation from embedded file

See merge request espressif/esp-idf!9078
This commit is contained in:
Angus Gratton
2020-06-17 07:57:27 +08:00
parent b48cc853fc 01a7db799f
commit b3e77c7ce9
9 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/test_apps/build_system/embed_test/CMakeLists.txt Normal file
View File

@@ -0,0 +1,6 @@
# The following lines of boilerplate have to be in your project's
# CMakeLists in this exact order for cmake to work correctly
cmake_minimum_required(VERSION 3.5)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(file_embed_test)

1
tools/test_apps/build_system/embed_test/README.txt Normal file
View File

@@ -0,0 +1 @@
This project tests that proper identifiers are generated during build for embedded files.

0
tools/test_apps/build_system/embed_test/main/2file.txt Normal file
View File

4
tools/test_apps/build_system/embed_test/main/CMakeLists.txt Normal file
View File

@@ -0,0 +1,4 @@
idf_component_register(SRCS "test_main.c"
INCLUDE_DIRS "."
# Test file names starting with a number, a letter and an underscore.
EMBED_TXTFILES "2file.txt" "file.txt" "_file.txt")

0
tools/test_apps/build_system/embed_test/main/_file.txt Normal file
View File

0
tools/test_apps/build_system/embed_test/main/file.txt Normal file
View File

18
tools/test_apps/build_system/embed_test/main/test_main.c Normal file
View File

@@ -0,0 +1,18 @@
#include <stdint.h>
#include <stdio.h>
extern uint8_t _2file_start[] asm("_binary_2file_txt_start");
extern uint8_t _2file_end[] asm("_binary_2file_txt_end");
extern uint8_t file_start[] asm("_binary_file_txt_start");
extern uint8_t file_end[] asm("_binary_file_txt_start");
extern uint8_t _file_start[] asm("_binary__file_txt_start");
extern uint8_t _file_end[] asm("_binary__file_txt_start");
#define PRINT_ADDR(f) printf("%s -> start: %p end:%p\n", #f, f ## _start, f ## _end);
void app_main(void)
{
PRINT_ADDR(_2file);
PRINT_ADDR(file);
PRINT_ADDR(_file);
}

2
tools/test_apps/system/build_test/main/CMakeLists.txt
View File

@@ -1,2 +1,4 @@
idf_component_register(SRCS "test_main.c"
INCLUDE_DIRS ".")