Skip to content

Commit 327bdd9

Browse files
Merge branch 'master' of https://github.com/esp8266/Arduino into all-ssl-to-flash
2 parents 05172f5 + dddc8d2 commit 327bdd9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// Do not edit -- Automatically generated by tools/sdk/ssl/bearssl/Makefile
2-
#define BEARSSL_GIT 6b9587f
2+
#define BEARSSL_GIT 0d7d5e2

tools/sdk/ld/eagle.app.v6.common.ld.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ SECTIONS
135135
{
136136
_irom0_text_start = ABSOLUTE(.);
137137
*(.ver_number)
138-
*.c.o( EXCLUDE_FILE (umm_malloc.c.o) .literal*, EXCLUDE_FILE (umm_malloc.c.o) .text* )
139-
*.cpp.o(.literal*, .text*)
138+
*.c.o(.literal*, .text*)
139+
*.cpp.o(EXCLUDE_FILE (umm_malloc.cpp.o) .literal*, EXCLUDE_FILE (umm_malloc.cpp.o) .text*)
140140
*.cc.o(.literal*, .text*)
141141
#ifdef VTABLES_IN_FLASH
142142
*(.rodata._ZTV*) /* C++ vtables */

0 commit comments

Comments
 (0)