diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2012-11-30 21:02:29 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2012-11-30 21:02:29 +0000 |
| commit | 299fc29a59f7f301a1f33092c2ffab1ab22b67dc (patch) | |
| tree | 8c34ee7e5ad8a84b065722627845dd00a6f23d7d /libcxx/src/exception.cpp | |
| parent | c5917d9a38ce0e4ad0a8f888f759de382dbe8f2d (diff) | |
| download | llvm-299fc29a59f7f301a1f33092c2ffab1ab22b67dc.zip llvm-299fc29a59f7f301a1f33092c2ffab1ab22b67dc.tar.gz llvm-299fc29a59f7f301a1f33092c2ffab1ab22b67dc.tar.bz2 | |
[CMake] Add support for selecting which c++ abi library to use.
llvm-svn: 169036
Diffstat (limited to 'libcxx/src/exception.cpp')
| -rw-r--r-- | libcxx/src/exception.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp index 0dbb660..f5e6d22 100644 --- a/libcxx/src/exception.cpp +++ b/libcxx/src/exception.cpp @@ -41,7 +41,7 @@ namespace std { -#if !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION) +#if !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION) && !defined(__GLIBCXX__) // libcxxrt provides implementations of these functions itself. unexpected_handler @@ -99,7 +99,7 @@ terminate() _NOEXCEPT } #endif // !defined(LIBCXXRT) && !defined(_LIBCPPABI_VERSION) -#ifndef LIBCXXRT +#if !defined(LIBCXXRT) && !defined(__GLIBCXX__) bool uncaught_exception() _NOEXCEPT { #if __APPLE__ || defined(_LIBCPPABI_VERSION) @@ -124,7 +124,7 @@ const char* exception::what() const _NOEXCEPT #endif // _LIBCPPABI_VERSION #endif //LIBCXXRT -#ifndef _LIBCPPABI_VERSION +#if !defined(_LIBCPPABI_VERSION) && !defined(__GLIBCXX__) bad_exception::~bad_exception() _NOEXCEPT { |