From 549048f39006eb253f9c3bd13215643d3f95e100 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Thu, 18 Apr 2019 17:18:15 +0000 Subject: [libc++] Make sure we re-export some missing libc++abi symbols from libc++ Summary: Ensure we re-export __cxa_throw_bad_array_new_length and __cxa_uncaught_exceptions from libc++, since they are now provided by libc++abi. Doing this allows us to stop linking explicitly against libc++abi in the libc++abi tests, since libc++ re-exports all the necessary symbols. However, there is one caveat to that. We don't want libc++ to re-export __cxa_uncaught_exception (the singular form), since it's only provided for backwards compatibility. Hence, for the single test where we check this backwards compatibility, we explicitly link against libc++abi. PR27405 PR22654 Reviewers: EricWF Subscribers: christof, jkorous, dexonsmith, libcxx-commits Tags: #libc Differential Revision: https://reviews.llvm.org/D60424 llvm-svn: 358690 --- libcxx/lib/libc++abi.v2.exp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libcxx/lib/libc++abi.v2.exp') diff --git a/libcxx/lib/libc++abi.v2.exp b/libcxx/lib/libc++abi.v2.exp index 40c055dae97..dfc308f8010 100644 --- a/libcxx/lib/libc++abi.v2.exp +++ b/libcxx/lib/libc++abi.v2.exp @@ -15,6 +15,8 @@ ___cxa_pure_virtual ___cxa_deleted_virtual ___cxa_begin_catch ___cxa_throw +___cxa_throw_bad_array_new_length +___cxa_uncaught_exceptions ___cxa_vec_cctor ___cxa_vec_cleanup ___cxa_vec_ctor -- cgit v1.2.3