diff options
| author | microDev <70126934+microDev1@users.noreply.github.com> | 2021-01-12 18:28:38 +0530 |
|---|---|---|
| committer | microDev <70126934+microDev1@users.noreply.github.com> | 2021-01-12 18:28:38 +0530 |
| commit | cd16f29efdc2df4544ffcccca5ae227be2f816ba (patch) | |
| tree | 8a90c5519f5b478d72d1647f7a537918bb543fdd /supervisor | |
| parent | 5f448139e0c5972def8a8f138cd29afd1e9222f8 (diff) | |
| parent | 047708e36e67beee14771120296cdf758f00601d (diff) | |
Merge branch 'main' into TouchAlarm
Diffstat (limited to 'supervisor')
| -rw-r--r-- | supervisor/shared/filesystem.c | 2 | ||||
| -rw-r--r-- | supervisor/shared/translate.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/supervisor/shared/filesystem.c b/supervisor/shared/filesystem.c index 88603be0c..618dc796b 100644 --- a/supervisor/shared/filesystem.c +++ b/supervisor/shared/filesystem.c @@ -74,7 +74,7 @@ static void make_sample_code_file(FATFS *fatfs) { #if CIRCUITPY_FULL_BUILD FIL fs; UINT char_written = 0; - const byte buffer[] = "print('Hello World!')\n"; + const byte buffer[] = "print(\"Hello World!\")\n"; //Create or modify existing code.py file f_open(fatfs, &fs, "/code.py", FA_WRITE | FA_CREATE_ALWAYS); f_write(&fs, buffer, sizeof(buffer) - 1, &char_written); diff --git a/supervisor/shared/translate.c b/supervisor/shared/translate.c index 44544c98d..8bd3c5acd 100644 --- a/supervisor/shared/translate.c +++ b/supervisor/shared/translate.c @@ -122,7 +122,12 @@ char* decompress(const compressed_string_t* compressed, char* decompressed) { return decompressed; } -inline __attribute__((always_inline)) const compressed_string_t* translate(const char* original) { +inline +// gcc10 -flto has issues with this being always_inline for debug builds. +#if CIRCUITPY_DEBUG < 1 + __attribute__((always_inline)) +#endif +const compressed_string_t* translate(const char* original) { #ifndef NO_QSTR #define QDEF(id, str) #define TRANSLATION(id, firstbyte, ...) if (strcmp(original, id) == 0) { static const compressed_string_t v = { .data = firstbyte, .tail = { __VA_ARGS__ } }; return &v; } else |