commit 1da887ea0a43fd09e9be35df48bb28af89f2ef6a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Oct 06 00:48:13 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 06 00:48:13 2023 +0000
tree a648fe8c04f8bc9873688776c4c60a618f940b21
parent 3852cfe4cb56bd63eb3d1242a8123c40bbd501ec
parent 0194ba475f4a3c8fe656fa87918304af7bf9ea6d

Merge "Remove unused declarations." into main am: 488887c8ea am: 0194ba475f

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

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

linker/linker.h

diff --git a/linker/linker.h b/linker/linker.h
index f5bb0ec..275182f 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -103,10 +103,6 @@
 
 int do_dladdr(const void* addr, Dl_info* info);
 
-// void ___cfi_slowpath(uint64_t CallSiteTypeId, void *Ptr, void *Ret);
-// void ___cfi_slowpath_diag(uint64_t CallSiteTypeId, void *Ptr, void *DiagData, void *Ret);
-void ___cfi_fail(uint64_t CallSiteTypeId, void* Ptr, void *DiagData, void *Ret);
-
 void set_application_target_sdk_version(int target);
 int get_application_target_sdk_version();