Skip to content

Commit ef28879

Browse files
committed
Merged remote tracking branch 'upstream/master'
2 parents 2c45596 + 8562b36 commit ef28879

File tree

13 files changed

+644
-2232
lines changed

13 files changed

+644
-2232
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ uVision Project/
4444
*.sublime*
4545

4646
*.bak
47-
debug.log
47+
debug.log

libraries/mbed/common/retarget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ extern "C" int mkdir(const char *path, mode_t mode) {
379379
return fs->mkdir(fp.fileName(), mode);
380380
}
381381

382-
#if defined(TOOLCHAIN_GCC_CR) || defined(TOOLCHAIN_GCC_CS) || defined(TOOLCHAIN_GCC_ARM)
382+
#if defined(TOOLCHAIN_GCC)
383383
/* prevents the exception handling name demangling code getting pulled in */
384384
#include "error.h"
385385
namespace __gnu_cxx {

libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11XX/core_cm0.c

Lines changed: 0 additions & 279 deletions
This file was deleted.

0 commit comments

Comments
 (0)