avoid linker error: use MICROPY_NLR_THUMB_USE_LONG_JUMP; update translations

Author: dhalbert

locale/circuitpython.pot

@@ -915,10 +915,6 @@ msgstr ""
 msgid "ESP-IDF memory allocation failed"
 msgstr ""
 
-#: extmod/modopenamp.c
-msgid "Endpoint not ready"
-msgstr ""
-
 #: extmod/modre.c
 msgid "Error in regex"
 msgstr ""
@@ -987,34 +983,10 @@ msgstr ""
 msgid "Failed to connect: timeout"
 msgstr ""
 
-#: extmod/modopenamp.c
-msgid "Failed to create RPMsg endpoint"
-msgstr ""
-
-#: extmod/modopenamp.c
-msgid "Failed to create virtio device"
-msgstr ""
-
-#: extmod/modopenamp.c
-msgid "Failed to initialize device io region"
-msgstr ""
-
-#: extmod/modopenamp.c
-msgid "Failed to initialize vrings"
-msgstr ""
-
-#: extmod/modopenamp.c
-msgid "Failed to open metal device"
-msgstr ""
-
 #: shared-module/audiomp3/MP3Decoder.c
 msgid "Failed to parse MP3 file"
 msgstr ""
 
-#: extmod/modopenamp.c
-msgid "Failed to register metal device"
-msgstr ""
-
 #: ports/nordic/sd_mutex.c
 #, c-format
 msgid "Failed to release mutex, err 0x%04x"
@@ -2434,6 +2406,10 @@ msgstr ""
 msgid "argsort is not implemented for flattened arrays"
 msgstr ""
 
+#: extmod/ulab/code/numpy/random/random.c
+msgid "argument must be None, an integer or a tuple of integers"
+msgstr ""
+
 #: py/compile.c
 msgid "argument name reused"
 msgstr ""
@@ -2734,10 +2710,6 @@ msgstr ""
 msgid "can't truncate-divide a complex number"
 msgstr ""
 
-#: extmod/moductypes.c
-msgid "can't unambiguously get sizeof scalar"
-msgstr ""
-
 #: extmod/modasyncio.c
 msgid "can't wait"
 msgstr ""
@@ -2895,18 +2867,6 @@ msgstr ""
 msgid "default is not a function"
 msgstr ""
 
-#: extmod/machine_usb_device.c
-msgid "desc_cfg"
-msgstr ""
-
-#: extmod/machine_usb_device.c
-msgid "desc_dev"
-msgstr ""
-
-#: extmod/machine_usb_device.c
-msgid "desc_strs"
-msgstr ""
-
 #: shared-bindings/audiobusio/PDMIn.c
 msgid ""
 "destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
@@ -3332,10 +3292,6 @@ msgstr ""
 msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
 msgstr ""
 
-#: extmod/modopenamp.c
-msgid "invalid callback"
-msgstr ""
-
 #: shared-module/ssl/SSLSocket.c
 msgid "invalid cert"
 msgstr ""
@@ -3431,10 +3387,6 @@ msgstr ""
 msgid "lhs and rhs should be compatible"
 msgstr ""
 
-#: extmod/modopenamp_remoteproc.c
-msgid "loading firmware is not supported."
-msgstr ""
-
 #: py/emitnative.c
 msgid "local '%q' has type '%q' but source is '%q'"
 msgstr ""
@@ -3484,7 +3436,7 @@ msgstr ""
 msgid "max_length must be 0-%d when fixed_length is %s"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
+#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/random/random.c
 msgid "maximum number of dimensions is "
 msgstr ""
 
@@ -3626,7 +3578,7 @@ msgstr ""
 msgid "no default packer"
 msgstr ""
 
-#: extmod/modrandom.c
+#: extmod/modrandom.c extmod/ulab/code/numpy/random/random.c
 msgid "no default seed"
 msgstr ""
 
@@ -3835,6 +3787,10 @@ msgstr ""
 msgid "out array is too small"
 msgstr ""
 
+#: extmod/ulab/code/numpy/random/random.c
+msgid "out has wrong type"
+msgstr ""
+
 #: extmod/ulab/code/numpy/vector.c
 msgid "out keyword is not supported for complex dtype"
 msgstr ""
@@ -3859,6 +3815,14 @@ msgstr ""
 msgid "out of range of target"
 msgstr ""
 
+#: extmod/ulab/code/numpy/random/random.c
+msgid "output array has wrong type"
+msgstr ""
+
+#: extmod/ulab/code/numpy/random/random.c
+msgid "output array must be contiguous"
+msgstr ""
+
 #: py/objint_mpz.c
 msgid "overflow converting long int to machine word"
 msgstr ""
@@ -3985,6 +3949,10 @@ msgstr ""
 msgid "set unsupported"
 msgstr ""
 
+#: extmod/ulab/code/numpy/random/random.c
+msgid "shape must be None, and integer or a tuple of integers"
+msgstr ""
+
 #: extmod/ulab/code/ndarray.c
 msgid "shape must be integer or tuple of integers"
 msgstr ""
@@ -4005,6 +3973,10 @@ msgstr ""
 msgid "size is defined for ndarrays only"
 msgstr ""
 
+#: extmod/ulab/code/numpy/random/random.c
+msgid "size must match out.shape when used together"
+msgstr ""
+
 #: py/nativeglue.c
 msgid "slice unsupported"
 msgstr ""
@@ -4078,18 +4050,6 @@ msgstr ""
 msgid "string indices must be integers, not %s"
 msgstr ""
 
-#: extmod/moductypes.c
-msgid "struct: can't index"
-msgstr ""
-
-#: extmod/moductypes.c
-msgid "struct: index out of range"
-msgstr ""
-
-#: extmod/moductypes.c
-msgid "struct: no fields"
-msgstr ""
-
 #: py/objarray.c py/objstr.c
 msgid "substring not found"
 msgstr ""
@@ -4102,10 +4062,6 @@ msgstr ""
 msgid "syntax error in JSON"
 msgstr ""
 
-#: extmod/moductypes.c
-msgid "syntax error in uctypes descriptor"
-msgstr ""
-
 #: extmod/modtime.c
 msgid "ticks interval overflow"
 msgstr ""
@@ -4118,10 +4074,6 @@ msgstr ""
 msgid "timeout must be < 655.35 secs"
 msgstr ""
 
-#: extmod/modopenamp.c
-msgid "timeout waiting for a free buffer"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/floppyio/__init__.c
 msgid "timeout waiting for flux"
 msgstr ""

ports/atmel-samd/mpconfigport.h

@@ -46,6 +46,12 @@
 // Only support simpler HID descriptors on SAMD21.
 #define CIRCUITPY_USB_HID_MAX_REPORT_IDS_PER_DESCRIPTOR (1)
 
+// Avoid linker error:
+// <artificial>:(.text.nlr_push+0x20): relocation truncated to fit: R_ARM_THM_JUMP11 against symbol `nlr_push_tail' defined in .text.nlr_push_tail section in /tmp/ccvHNpPQ.ltrans0.ltrans.o
+// See https://github.com/micropython/micropython/pull/11353
+#define MICROPY_NLR_THUMB_USE_LONG_JUMP (1)
+
+
 #endif // SAMD21
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////