djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid inline compile errors

Browse Source
This commit is contained in:
Dan Halbert 2021-01-08 22:16:58 -05:00
parent 55c80754c7
commit 255ffa979c
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
py/circuitpy_defns.mk
View File

@ -58,6 +58,14 @@ BASE_CFLAGS = \
# -H # -H
# Set a global CIRCUITPY_DEBUG flag.
# Don't just call it "DEBUG": too many libraries use plain DEBUG.
ifneq ($(DEBUG),)
CFLAGS += -DCIRCUITPY_DEBUG=$(DEBUG)
else
CFLAGS += -DCIRCUITPY_DEBUG=0
endif
### ###
# Handle frozen modules. # Handle frozen modules.

7
supervisor/shared/translate.c
View File

@ -122,7 +122,12 @@ char* decompress(const compressed_string_t* compressed, char* decompressed) {
return 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 #ifndef NO_QSTR
#define QDEF(id, str) #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 #define TRANSLATION(id, firstbyte, ...) if (strcmp(original, id) == 0) { static const compressed_string_t v = { .data = firstbyte, .tail = { __VA_ARGS__ } }; return &v; } else