5 files changed, 34 insertions, 1 deletions
diff --git a/lib/axtls b/lib/axtls
-Subproject c2690dc100f272cb01375dcf2f2be7105d0fb7c
+Subproject 67d27df4b5d097e146599fc4fb160a2adcbf563
diff --git a/lib/berkeley-db-1.xx b/lib/berkeley-db-1.xx
-Subproject 7b31cae3c0892a7fca2089cb0354a4920c98c41
+Subproject 78a4787948bb80cbfafcfd7910f95f61a4dd0d4
diff --git a/lib/embed/abort_.c b/lib/embed/abort_.c
new file mode 100644
index 0000000000..a6df8143c3
--- /dev/null
+++ b/lib/embed/abort_.c
@@ -0,0 +1,7 @@
+#include <py/runtime.h>
+
+NORETURN void abort_(void);
+
+NORETURN void abort_(void) {
+    nlr_raise(mp_obj_new_exception_msg(&mp_type_RuntimeError, "abort() called"));
+}
diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
index ddecb6a8d8..411ee969d6 100644
--- a/lib/utils/pyexec.c
+++ b/lib/utils/pyexec.c
@@ -40,7 +40,7 @@
 #include "irq.h"
 #include "usb.h"
 #endif
-#include "readline.h"
+#include "lib/mp-readline/readline.h"
 #include "lib/utils/pyexec.h"
 #include "genhdr/mpversion.h"
 
diff --git a/lib/utils/stdout_helpers.c b/lib/utils/stdout_helpers.c
new file mode 100644
index 0000000000..6efe10b92c
--- /dev/null
+++ b/lib/utils/stdout_helpers.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include <unistd.h>
+#include "py/mpconfig.h"
+#include "py/mphal.h"
+
+/*
+ * Extra stdout functions
+ * These can be either optimized for a particular port, or reference
+ * implementation below can be used.
+ */
+
+// Send "cooked" string of given length, where every occurance of
+// LF character is replaced with CR LF.
+void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
+    while (len--) {
+        if (*str == '\n') {
+            mp_hal_stdout_tx_strn("\r", 1);
+        }
+        mp_hal_stdout_tx_strn(str++, 1);
+    }
+}
+
+// Send zero-terminated string
+void mp_hal_stdout_tx_str(const char *str) {
+    mp_hal_stdout_tx_strn(str, strlen(str));
+}