fix mpy-cross

tannewt · tannewt · commit 137a30ad7580 · 2018-08-16T17:40:57.000-07:00
diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
@@ -11,8 +11,12 @@
 
 import collections
 import gettext
+import os.path
 
-sys.path.append("../../tools/huffman")
+py = os.path.dirname(sys.argv[0])
+top = os.path.dirname(py)
+
+sys.path.append(os.path.join(top, "tools/huffman"))
 
 import huffman
 
diff --git a/supervisor/shared/translate.c b/supervisor/shared/translate.c
@@ -71,8 +71,6 @@ char* decompress(const compressed_string_t* compressed, char* decompressed) {
     return decompressed;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wreturn-local-addr"
 inline __attribute__((always_inline)) const compressed_string_t* translate(const char* original) {
     #ifndef NO_QSTR
     #define QDEF(id, str)
@@ -83,4 +81,3 @@ inline __attribute__((always_inline)) const compressed_string_t* translate(const
     #endif
     return NULL;
 }
-#pragma GCC diagnostic pop

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,6 @@ char* decompress(const compressed_string_t* compressed, char* decompressed) {`
`71`	`71`	`return decompressed;`
`72`	`72`	`}`
`73`	`73`
`74`		`-#pragma GCC diagnostic push`
`75`		`-#pragma GCC diagnostic ignored "-Wreturn-local-addr"`
`76`	`74`	`inline __attribute__((always_inline)) const compressed_string_t* translate(const char* original) {`
`77`	`75`	`#ifndef NO_QSTR`
`78`	`76`	`#define QDEF(id, str)`
`@@ -83,4 +81,3 @@ inline __attribute__((always_inline)) const compressed_string_t* translate(const`
`83`	`81`	`#endif`
`84`	`82`	`return NULL;`
`85`	`83`	`}`
`86`		`-#pragma GCC diagnostic pop`