Skip to content

Commit fe2122d

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 572df0f + 4ef35a9 commit fe2122d

File tree

151 files changed

+15905
-809
lines changed

Some content is hidden

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

151 files changed

+15905
-809
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ env:
109109
- RTT_BSP='stm32/stm32l4r9-st-eval' RTT_TOOL_CHAIN='sourcery-arm'
110110
- RTT_BSP='stm32/stm32l010-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
111111
- RTT_BSP='stm32/stm32l053-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
112+
- RTT_BSP='stm32/stm32l412-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
112113
- RTT_BSP='stm32/stm32l432-st-nucleo' RTT_TOOL_CHAIN='sourcery-arm'
113114
- RTT_BSP='stm32/stm32l475-atk-pandora' RTT_TOOL_CHAIN='sourcery-arm'
114115
- RTT_BSP='stm32/stm32l475-st-discovery' RTT_TOOL_CHAIN='sourcery-arm'

bsp/lpc54608-LPCXpresso/project.ewp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2148,16 +2148,16 @@
21482148
<group>
21492149
<name>CPlusPlus</name>
21502150
<file>
2151-
<name>$PROJ_DIR$\../../components/cplusplus/Mutex.cpp</name>
2151+
<name>$PROJ_DIR$\../../components/cplusplus/cxx_Mutex.cpp</name>
21522152
</file>
21532153
<file>
2154-
<name>$PROJ_DIR$\../../components/cplusplus/Semaphore.cpp</name>
2154+
<name>$PROJ_DIR$\../../components/cplusplus/cxx_Semaphore.cpp</name>
21552155
</file>
21562156
<file>
2157-
<name>$PROJ_DIR$\../../components/cplusplus/Thread.cpp</name>
2157+
<name>$PROJ_DIR$\../../components/cplusplus/cxx_Thread.cpp</name>
21582158
</file>
21592159
<file>
2160-
<name>$PROJ_DIR$\../../components/cplusplus/crt.cpp</name>
2160+
<name>$PROJ_DIR$\../../components/cplusplus/cxx_crt.cpp</name>
21612161
</file>
21622162
<file>
21632163
<name>$PROJ_DIR$\../../components/cplusplus/crt_init.c</name>

bsp/lpc54608-LPCXpresso/project.ewt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2355,19 +2355,19 @@
23552355
<group>
23562356
<name>CPlusPlus</name>
23572357
<file>
2358-
<name>$PROJ_DIR$\..\..\components\cplusplus\crt.cpp</name>
2358+
<name>$PROJ_DIR$\..\..\components\cplusplus\cxx_crt.cpp</name>
23592359
</file>
23602360
<file>
23612361
<name>$PROJ_DIR$\..\..\components\cplusplus\crt_init.c</name>
23622362
</file>
23632363
<file>
2364-
<name>$PROJ_DIR$\..\..\components\cplusplus\Mutex.cpp</name>
2364+
<name>$PROJ_DIR$\..\..\components\cplusplus\cxx_Mutex.cpp</name>
23652365
</file>
23662366
<file>
2367-
<name>$PROJ_DIR$\..\..\components\cplusplus\Semaphore.cpp</name>
2367+
<name>$PROJ_DIR$\..\..\components\cplusplus\cxx_Semaphore.cpp</name>
23682368
</file>
23692369
<file>
2370-
<name>$PROJ_DIR$\..\..\components\cplusplus\Thread.cpp</name>
2370+
<name>$PROJ_DIR$\..\..\components\cplusplus\cxx_Thread.cpp</name>
23712371
</file>
23722372
</group>
23732373
<group>

0 commit comments

Comments
 (0)