From d9afc0ab30060517f5a18efc7c70f412d0d99340 Mon Sep 17 00:00:00 2001
From: Ledion Daja <ledion.daja@arm.com>
Date: Mon, 6 Nov 2023 17:35:06 +0100
Subject: Remove workaround for libmetal support with ARMCC v6 compiler

A workaround had been added previously to support building of libmetal
library with ARMCC v6. Since such support has recently been added
upstream in the libmetal repository, the workaround can now be removed.

Change-Id: Idb5e6ba3112e329a0c2193d35c80c3cb45f90486
Signed-off-by: Ledion Daja <ledion.daja@arm.com>
---
 openamp/CMakeLists.txt       |  3 ---
 openamp/src/libmetal/errno.h | 23 -----------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 openamp/src/libmetal/errno.h

diff --git a/openamp/CMakeLists.txt b/openamp/CMakeLists.txt
index 0a756c8..07b07d7 100644
--- a/openamp/CMakeLists.txt
+++ b/openamp/CMakeLists.txt
@@ -1,6 +1,5 @@
 #
 # SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
-#
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the License); you may
@@ -67,8 +66,6 @@ function(build_openamp PROJECT_SYSTEM)
         configure_file("libmetal/lib/${HDR}" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_SYSTEM}/metal/${HDR}")
     endforeach()
 
-    # Override errno.h adding support for ArmClang
-    configure_file("src/libmetal/errno.h" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_SYSTEM}/metal/errno.h")
 endfunction()
 
 build_openamp(generic)
diff --git a/openamp/src/libmetal/errno.h b/openamp/src/libmetal/errno.h
deleted file mode 100644
index c933a0c..0000000
--- a/openamp/src/libmetal/errno.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2020 STMicroelectronnics. All rights reserved.
- * SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/*
- * @file      metal/errno.h
- * @brief     error specific primitives for libmetal.
- */
-
-#ifndef __METAL_ERRNO__H__
-#define __METAL_ERRNO__H__
-
-#if defined(__ICCARM__)
-# include <metal/compiler/iar/errno.h>
-#elif defined(__CC_ARM) || defined (__ARMCC_VERSION)
-# include <metal/compiler/armcc/errno.h>
-#else
-# include <errno.h>
-#endif
-
-#endif /* __METAL_ERRNO__H__ */
-- 
cgit v1.2.1