diff options
| author | Haibo Huang <hhb@google.com> | 2020-09-02 16:45:42 -0700 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2020-09-02 16:46:40 -0700 |
| commit | 95c5e1e88a92d76e0165e11d011bd54baf1a9444 (patch) | |
| tree | d14bb938040c1fbd8bc15845a5250ad0743a8568 | |
| parent | 3fea0892a689e7ddb73d4523419458be9c545265 (diff) | |
| download | gdb-95c5e1e88a92d76e0165e11d011bd54baf1a9444.tar.gz | |
Revert aosp/989766
It is no longer needed.
Bug: 166741062
Bug: 136093140
Change-Id: I3c7d3cebd0cd77b1a490b9f040a9102901e60b47
| -rw-r--r-- | gdb-8.3/gdb/common/new-op.c | 5 | ||||
| -rw-r--r-- | gdb-8.3/gdb/configure.nat | 2 | ||||
| -rw-r--r-- | gdb-9.1/gdb/gdbsupport/new-op.c | 5 |
3 files changed, 0 insertions, 12 deletions
diff --git a/gdb-8.3/gdb/common/new-op.c b/gdb-8.3/gdb/common/new-op.c index 3d3d2c2df..ce97a207b 100644 --- a/gdb-8.3/gdb/common/new-op.c +++ b/gdb-8.3/gdb/common/new-op.c @@ -22,10 +22,6 @@ # define __has_feature(x) 0 #endif -// ANDROID CHANGE: Can not override operator new for libc++ in WIN32. -// See b/135839860. -#if !defined(_WIN32) - #if !__has_feature(address_sanitizer) && !defined(__SANITIZE_ADDRESS__) #include "common-defs.h" #include "host-defs.h" @@ -101,4 +97,3 @@ operator new[] (std::size_t sz, const std::nothrow_t&) noexcept } #endif -#endif diff --git a/gdb-8.3/gdb/configure.nat b/gdb-8.3/gdb/configure.nat index 0972bf2b5..64ee101d8 100644 --- a/gdb-8.3/gdb/configure.nat +++ b/gdb-8.3/gdb/configure.nat @@ -325,8 +325,6 @@ case ${gdb_host} in case ${gdb_host_cpu} in i386) NATDEPFILES="${NATDEPFILES} amd64-windows-nat.o" - # ANDROID CHANGE: libc++ requires libucrt. See b/136093140 - LOADLIBES="-lc++ -nodefaultlibs -Wl,--start-group -lmingw32 -lgcc -lgcc_eh -lmoldname -lmingwex -lmsvcrt -lucrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32 -lpsapi -Wl,--end-group" ;; esac ;; diff --git a/gdb-9.1/gdb/gdbsupport/new-op.c b/gdb-9.1/gdb/gdbsupport/new-op.c index c0c943e1a..e7b7bee7d 100644 --- a/gdb-9.1/gdb/gdbsupport/new-op.c +++ b/gdb-9.1/gdb/gdbsupport/new-op.c @@ -22,10 +22,6 @@ # define __has_feature(x) 0 #endif -// ANDROID CHANGE: Can not override operator new for libc++ in WIN32. -// See b/135839860. -#if !defined(_WIN32) - #if !__has_feature(address_sanitizer) && !defined(__SANITIZE_ADDRESS__) #include "common-defs.h" #include "host-defs.h" @@ -98,4 +94,3 @@ operator new[] (std::size_t sz, const std::nothrow_t&) noexcept } #endif -#endif |