diff options
author | Peter Lin <linpeter@google.com> | 2023-12-06 10:37:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-06 10:37:37 +0000 |
commit | 7b7881e5fe2303c1dbaba7ef264665a05ced99f6 (patch) | |
tree | 4d8f7afe0de7c22c8381ebccae20fc54ab90cb21 | |
parent | f1f5386664e76426e939e67e14c0b2431ac12b4a (diff) | |
parent | 64cbc6ccd1140c8f81afbc93232914136427dd54 (diff) | |
download | unwinding-7b7881e5fe2303c1dbaba7ef264665a05ced99f6.tar.gz |
Revert "Only export unwindstack:: functions." am: 64cbc6ccd1
Original change: https://android-review.googlesource.com/c/platform/system/unwinding/+/2861747
Change-Id: I9913c5abbb83dde794ae402b4d7660f7f87c6816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | libunwindstack/Android.bp | 2 | ||||
-rw-r--r-- | libunwindstack/AsmGetRegsX86.S | 3 | ||||
-rw-r--r-- | libunwindstack/AsmGetRegsX86_64.S | 3 | ||||
-rw-r--r-- | libunwindstack/exported.map | 7 | ||||
-rw-r--r-- | libunwindstack/include/unwindstack/RegsGetLocal.h | 2 |
5 files changed, 1 insertions, 16 deletions
diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp index b1a3480..d2b02c6 100644 --- a/libunwindstack/Android.bp +++ b/libunwindstack/Android.bp @@ -196,11 +196,9 @@ cc_library { }, android: { runtime_libs: ["libdexfile"], // libdexfile_support dependency - version_script: "exported.map", }, linux: { runtime_libs: ["libdexfile"], // libdexfile_support dependency - version_script: "exported.map", }, }, diff --git a/libunwindstack/AsmGetRegsX86.S b/libunwindstack/AsmGetRegsX86.S index 323ee26..021e628 100644 --- a/libunwindstack/AsmGetRegsX86.S +++ b/libunwindstack/AsmGetRegsX86.S @@ -26,9 +26,6 @@ * SUCH DAMAGE. */ -// Use the mangled name to make it easy to export functions. -#define AsmGetRegs _ZN11unwindstack10AsmGetRegsEPv - .text .global AsmGetRegs .balign 16 diff --git a/libunwindstack/AsmGetRegsX86_64.S b/libunwindstack/AsmGetRegsX86_64.S index dc5ecad..4cd3b6f 100644 --- a/libunwindstack/AsmGetRegsX86_64.S +++ b/libunwindstack/AsmGetRegsX86_64.S @@ -26,9 +26,6 @@ * SUCH DAMAGE. */ -// Use the mangled name to make it easy to export functions. -#define AsmGetRegs _ZN11unwindstack10AsmGetRegsEPv - .text .global AsmGetRegs .balign 16 diff --git a/libunwindstack/exported.map b/libunwindstack/exported.map deleted file mode 100644 index bfd236c..0000000 --- a/libunwindstack/exported.map +++ /dev/null @@ -1,7 +0,0 @@ -LIBUNWINDSTACK { - global: - *unwindstack*; - - local: - *; -}; diff --git a/libunwindstack/include/unwindstack/RegsGetLocal.h b/libunwindstack/include/unwindstack/RegsGetLocal.h index ac98c5f..4cdab9a 100644 --- a/libunwindstack/include/unwindstack/RegsGetLocal.h +++ b/libunwindstack/include/unwindstack/RegsGetLocal.h @@ -129,7 +129,7 @@ inline __attribute__((__always_inline__)) void AsmGetRegs(void* reg_data) { #elif defined(__i386__) || defined(__x86_64__) -void AsmGetRegs(void* regs); +extern "C" void AsmGetRegs(void* regs); #endif |