commit 083dfc08c90262ba02fc2f1c029d1f62b0a032bf
author Elliott Hughes <enh@google.com> Tue May 23 15:48:59 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 23 15:48:59 2023 +0000
tree d9147d5e16dca3ee68938a47e63fce31a3abf408
parent 29fae2f5370796ca35cc70cbc6d49ea0fd766cc5
parent c134209c6cc7a1970c98f57dda11271b11e26aa7

Merge "Fix the *return* types in the arm64 dynamic function dispatch." am: 3285ae5a4d am: c24fb3d6bc am: c134209c6c

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2598909

Change-Id: I18c9fe7b25a0a9d84b3ce7946d5bccc348569050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libc/arch-arm64/dynamic_function_dispatch.cpp

diff --git a/libc/arch-arm64/dynamic_function_dispatch.cpp b/libc/arch-arm64/dynamic_function_dispatch.cpp
index b32b2cd..b9f657b 100644
--- a/libc/arch-arm64/dynamic_function_dispatch.cpp
+++ b/libc/arch-arm64/dynamic_function_dispatch.cpp
@@ -41,7 +41,7 @@
     }
 }
 
-typedef void* memcmp_func(const void*, const void*, size_t);
+typedef int memcmp_func(const void*, const void*, size_t);
 DEFINE_IFUNC_FOR(memcmp) {
     // TODO: enable the SVE version.
     RETURN_FUNC(memcmp_func, __memcmp_aarch64);
@@ -65,7 +65,7 @@
     }
 }
 
-typedef int stpcpy_func(char*, const char*, size_t);
+typedef char* stpcpy_func(char*, const char*, size_t);
 DEFINE_IFUNC_FOR(stpcpy) {
     // TODO: enable the SVE version.
     RETURN_FUNC(stpcpy_func, __stpcpy_aarch64);
@@ -95,7 +95,7 @@
     RETURN_FUNC(strcmp_func, __strcmp_aarch64);
 }
 
-typedef int strcpy_func(char*, const char*);
+typedef char* strcpy_func(char*, const char*);
 DEFINE_IFUNC_FOR(strcpy) {
     // TODO: enable the SVE version.
     RETURN_FUNC(strcpy_func, __strcpy_aarch64);