diff --git a/targets/corstone-300/retarget.c b/targets/corstone-300/retarget.c
index 2549e42..9d71da0 100644
--- a/targets/corstone-300/retarget.c
+++ b/targets/corstone-300/retarget.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright 2019-2022 Arm Limited and/or its affiliates <open-source-office@arm.com>
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -172,6 +172,15 @@
     return -1;
 }
 
+#if __ARMCLIB_VERSION >= 6190004
+int RETARGET(_tmpnam2)(char *name, int sig, unsigned maxlen) {
+    (void)name;
+    (void)sig;
+    (void)maxlen;
+
+    return -1;
+}
+#else
 int RETARGET(_tmpnam)(char *name, int sig, unsigned maxlen) {
     (void)name;
     (void)sig;
@@ -179,6 +188,7 @@
 
     return 1;
 }
+#endif
 
 char *RETARGET(_command_string)(char *cmd, int len) {
     (void)len;
diff --git a/targets/corstone-310/retarget.c b/targets/corstone-310/retarget.c
index eb1c908..00772e2 100644
--- a/targets/corstone-310/retarget.c
+++ b/targets/corstone-310/retarget.c
@@ -172,6 +172,15 @@
     return -1;
 }
 
+#if __ARMCLIB_VERSION >= 6190004
+int RETARGET(_tmpnam2)(char *name, int sig, unsigned maxlen) {
+    (void)name;
+    (void)sig;
+    (void)maxlen;
+
+    return -1;
+}
+#else
 int RETARGET(_tmpnam)(char *name, int sig, unsigned maxlen) {
     (void)name;
     (void)sig;
@@ -179,6 +188,7 @@
 
     return 1;
 }
+#endif
 
 char *RETARGET(_command_string)(char *cmd, int len) {
     (void)len;
diff --git a/targets/demo/retarget.c b/targets/demo/retarget.c
index 3355e2e..7c53ba1 100644
--- a/targets/demo/retarget.c
+++ b/targets/demo/retarget.c
@@ -172,6 +172,15 @@
     return -1;
 }
 
+#if __ARMCLIB_VERSION >= 6190004
+int RETARGET(_tmpnam2)(char *name, int sig, unsigned maxlen) {
+    (void)name;
+    (void)sig;
+    (void)maxlen;
+
+    return -1;
+}
+#else
 int RETARGET(_tmpnam)(char *name, int sig, unsigned maxlen) {
     (void)name;
     (void)sig;
@@ -179,6 +188,7 @@
 
     return 1;
 }
+#endif
 
 char *RETARGET(_command_string)(char *cmd, int len) {
     (void)len;