Fix mpy-cross and lto builds (again)

jepler · jepler · commit 7fe886aeae31 · 2023-10-30T14:54:22.000+01:00
diff --git a/supervisor/shared/translate/translate.h b/supervisor/shared/translate/translate.h
@@ -34,7 +34,6 @@
 // Map MicroPython's error messages to our translations.
 #if !defined(MICROPY_ENABLE_DYNRUNTIME) || !MICROPY_ENABLE_DYNRUNTIME
 #include "supervisor/shared/translate/compressed_string.h"
-#define MP_COMPRESSED_ROM_TEXT(x) MP_ERROR_TEXT(x)
 
 // MP_ERROR_TEXT() is a giant function with many strcmp calls. The assumption is
 // that the build process will optimize this away and replace it with the
@@ -48,7 +47,7 @@
 #else
 // In link time optimized (LTO) builds, we can compile this once into a .o and
 // at link time the calls will be optimized.
-mp_rom_error_text_t MP_ERROR_TEXT(const char *c);
+mp_rom_error_text_t MP_COMPRESSED_ROM_TEXT(const char *c);
 #endif
 
 #else
diff --git a/supervisor/shared/translate/translate_impl.h b/supervisor/shared/translate/translate_impl.h
@@ -50,7 +50,7 @@ __attribute__((always_inline))
 #endif
 // Prevent instrumenting this because that disables the inlining we rely of for code size
 // optimization.
-__attribute__((no_instrument_function)) mp_rom_error_text_t translate(const char *original) {
+__attribute__((no_instrument_function)) mp_rom_error_text_t MP_COMPRESSED_ROM_TEXT(const char *original) {
     #ifndef NO_QSTR
     #define QDEF(id, hash, len, str)
     #define TRANSLATION(english_id, number) if (strcmp(original, english_id) == 0) { return (mp_rom_error_text_t)&translation##number; } else
