From 94caa83e30d4abe23ded0c596145ece5389e481b Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Mon, 18 Oct 2021 12:01:24 +0200
Subject: [PATCH] sys/picolibc_syscalls_default: support new picolibc stdio
 globals

(cherry picked from commit 27b9c6da06ab95fb58507ab2656e3ac16f094d69)
---
 sys/picolibc_syscalls_default/syscalls.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/picolibc_syscalls_default/syscalls.c b/sys/picolibc_syscalls_default/syscalls.c
index dc62d1c910..a28ec23678 100644
--- a/sys/picolibc_syscalls_default/syscalls.c
+++ b/sys/picolibc_syscalls_default/syscalls.c
@@ -235,11 +235,17 @@ static int picolibc_get(FILE *file)
 FILE picolibc_stdio =
     FDEV_SETUP_STREAM(picolibc_put, picolibc_get, picolibc_flush, _FDEV_SETUP_RW);
 
+#ifdef PICOLIBC_STDIO_GLOBALS
+FILE *const stdout = &picolibc_stdio;
+FILE *const stdin = &picolibc_stdio;
+FILE *const stderr = &picolibc_stdio;
+#else
 FILE *const __iob[] = {
-    &picolibc_stdio,    /* stdin  */
-    &picolibc_stdio,    /* stdout */
-    &picolibc_stdio,    /* stderr */
+    &picolibc_stdio,        /* stdin  */
+    &picolibc_stdio,        /* stdout */
+    &picolibc_stdio,        /* stderr */
 };
+#endif
 
 #include <thread.h>
 /**