summaryrefslogtreecommitdiffstats
path: root/libunwind/src/libunwind.cpp
diff options
context:
space:
mode:
authorPetr Hosek <phosek@chromium.org>2019-01-28 20:55:12 +0000
committerPetr Hosek <phosek@chromium.org>2019-01-28 20:55:12 +0000
commit4ecdb70424a7c057bf6858027abc3a0f59454210 (patch)
treecfa2a5c62198e6868bdece0afc1507c63867e0e3 /libunwind/src/libunwind.cpp
parent4155e789120b764911d7da5ec1ac7dc37069889b (diff)
downloadbcm5719-llvm-4ecdb70424a7c057bf6858027abc3a0f59454210.tar.gz
bcm5719-llvm-4ecdb70424a7c057bf6858027abc3a0f59454210.zip
Revert "[libunwind] Drop the dependency on <algorithm>, add placement new inline"
This reverts commit r352384: this broke on ARM as UnwindCursor.hpp still has some C++ library dependencies. llvm-svn: 352427
Diffstat (limited to 'libunwind/src/libunwind.cpp')
-rw-r--r--libunwind/src/libunwind.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libunwind/src/libunwind.cpp b/libunwind/src/libunwind.cpp
index cfa9112a633..a2496a06de9 100644
--- a/libunwind/src/libunwind.cpp
+++ b/libunwind/src/libunwind.cpp
@@ -11,6 +11,10 @@
#include <libunwind.h>
+#ifndef NDEBUG
+#include <cstdlib> // getenv
+#endif
+
#include "libunwind_ext.h"
#include "config.h"
@@ -23,10 +27,6 @@
using namespace libunwind;
-// libunwind does not and should not depend on C++ library which means that we
-// need our own declaration of global placement new.
-void *operator new(size_t, void*);
-
/// internal object to represent this processes address space
LocalAddressSpace LocalAddressSpace::sThisAddressSpace;
OpenPOWER on IntegriCloud