From 76a45ddd792754c4cb5e0d8093449d2e2751f3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonny=20Sv=C3=A4rd?= Date: Mon, 24 Oct 2022 17:40:19 +0200 Subject: Add support for ARMCompiler 6.19 See Release Notes for ARMCompiler 6.19 for more information about the _sys_tmpnam change. Change-Id: Icf05d4c59d7fc6aed437744edd017447450da9cd --- targets/corstone-300/retarget.c | 12 +++++++++++- targets/corstone-310/retarget.c | 10 ++++++++++ targets/demo/retarget.c | 10 ++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) (limited to 'targets') 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 * * SPDX-License-Identifier: Apache-2.0 * @@ -172,6 +172,15 @@ long RETARGET(_flen)(FILEHANDLE fh) { 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 @@ int RETARGET(_tmpnam)(char *name, int sig, unsigned maxlen) { 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 @@ long RETARGET(_flen)(FILEHANDLE fh) { 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 @@ int RETARGET(_tmpnam)(char *name, int sig, unsigned maxlen) { 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 @@ long RETARGET(_flen)(FILEHANDLE fh) { 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 @@ int RETARGET(_tmpnam)(char *name, int sig, unsigned maxlen) { return 1; } +#endif char *RETARGET(_command_string)(char *cmd, int len) { (void)len; -- cgit v1.2.1