Remove newlib workaround from libfdt
libfdt can now use the strnlen implementation from libc.
Signed-off-by: Imre Kis <imre.kis@arm.com>
Change-Id: Ic97135911d5f6370bdbe49e69c1c70374f15a8f5
diff --git a/external/libfdt/fix-strnlen.patch b/external/libfdt/fix-strnlen.patch
deleted file mode 100644
index 7a7bb7d..0000000
--- a/external/libfdt/fix-strnlen.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This patch enables using libfdt's strlen() implementation.
-
-diff --git i/libfdt/libfdt_env.h w/libfdt/libfdt_env.h
-index 73b6d40..3a2d38c 100644
---- i/libfdt/libfdt_env.h
-+++ w/libfdt/libfdt_env.h
-@@ -66,13 +66,6 @@ static inline fdt64_t cpu_to_fdt64(uint64_t x)
- #undef CPU_TO_FDT16
- #undef EXTRACT_BYTE
-
--#ifdef __APPLE__
--#include <AvailabilityMacros.h>
--
--/* strnlen() is not available on Mac OS < 10.7 */
--# if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < \
-- MAC_OS_X_VERSION_10_7)
--
- #define strnlen fdt_strnlen
-
- /*
-@@ -88,9 +81,4 @@ static inline size_t fdt_strnlen(const char *string, size_t max_count)
- return p ? p - string : max_count;
- }
-
--#endif /* !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED <
-- MAC_OS_X_VERSION_10_7) */
--
--#endif /* __APPLE__ */
--
- #endif /* LIBFDT_ENV_H */
diff --git a/external/libfdt/libfdt.cmake b/external/libfdt/libfdt.cmake
index 9da9bba..c3e96f5 100644
--- a/external/libfdt/libfdt.cmake
+++ b/external/libfdt/libfdt.cmake
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2022, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -18,7 +18,6 @@
set(GIT_OPTIONS
GIT_REPOSITORY ${DTC_URL}
GIT_TAG ${DTC_REFSPEC}
- PATCH_COMMAND git stash COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/fix-strnlen.patch
)
include(${TS_ROOT}/tools/cmake/common/LazyFetch.cmake REQUIRED)