From 87d1992f4f8cf7d0c07997c9059ace448f479056 Mon Sep 17 00:00:00 2001 From: Jaeden Amero Date: Thu, 10 Jun 2021 15:48:42 +0100 Subject: [PATCH] mbedtls: Rename Mbed timing implementation We get a linker warning with the recently added timing module implementation for Mbed. This is because there is Mbed TLS also ships a file called timing.c, which we are including in Mbed OS also. With CLI 1, we get an error about unique object files because of the similarly named implementation files. Object file timing.o is not unique! It could be made from: mbed-os/connectivity/mbedtls/source/timing.c mbed-os/connectivity/mbedtls/platform/src/timing.cpp Rename the Mbed timing module implementation to timing_mbed.cpp to avoid this naming conflict. Fixes: b8781e527bc1 ("mbedtls: Add an alt implementation of timing") Fixes #14759 --- connectivity/mbedtls/CMakeLists.txt | 2 +- .../mbedtls/platform/src/{timing.cpp => timing_mbed.cpp} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename connectivity/mbedtls/platform/src/{timing.cpp => timing_mbed.cpp} (100%) diff --git a/connectivity/mbedtls/CMakeLists.txt b/connectivity/mbedtls/CMakeLists.txt index f0196b2e238..51938fe78da 100644 --- a/connectivity/mbedtls/CMakeLists.txt +++ b/connectivity/mbedtls/CMakeLists.txt @@ -16,7 +16,7 @@ target_sources(mbed-mbedtls platform/src/mbed_trng.cpp platform/src/platform_alt.cpp platform/src/shared_rng.cpp - platform/src/timing.cpp + platform/src/timing_mbed.cpp source/aes.c source/aesni.c diff --git a/connectivity/mbedtls/platform/src/timing.cpp b/connectivity/mbedtls/platform/src/timing_mbed.cpp similarity index 100% rename from connectivity/mbedtls/platform/src/timing.cpp rename to connectivity/mbedtls/platform/src/timing_mbed.cpp