Mark new/delete as weak in the NDK stubs.
Test: make ndk
Bug: None
Change-Id: I76eef4f0265e87ddbad84ac8c5d56225aa240239
diff --git a/libc/libstdc++.arm.map b/libc/libstdc++.arm.map
index b6b269d..8ee5863 100644
--- a/libc/libstdc++.arm.map
+++ b/libc/libstdc++.arm.map
@@ -2,14 +2,14 @@
LIBC_O {
global:
_ZSt7nothrow; # var
- _ZdaPv;
- _ZdaPvRKSt9nothrow_t;
- _ZdlPv;
- _ZdlPvRKSt9nothrow_t;
- _Znaj; # arm x86 mips
- _ZnajRKSt9nothrow_t; # arm x86 mips
- _Znwj; # arm x86 mips
- _ZnwjRKSt9nothrow_t; # arm x86 mips
+ _ZdaPv; # weak
+ _ZdaPvRKSt9nothrow_t; # weak
+ _ZdlPv; # weak
+ _ZdlPvRKSt9nothrow_t; # weak
+ _Znaj; # arm x86 mips weak
+ _ZnajRKSt9nothrow_t; # arm x86 mips weak
+ _Znwj; # arm x86 mips weak
+ _ZnwjRKSt9nothrow_t; # arm x86 mips weak
__cxa_guard_abort;
__cxa_guard_acquire;
__cxa_guard_release;
diff --git a/libc/libstdc++.arm64.map b/libc/libstdc++.arm64.map
index d0433c9..cd4f3c3 100644
--- a/libc/libstdc++.arm64.map
+++ b/libc/libstdc++.arm64.map
@@ -2,14 +2,14 @@
LIBC_O {
global:
_ZSt7nothrow; # var
- _ZdaPv;
- _ZdaPvRKSt9nothrow_t;
- _ZdlPv;
- _ZdlPvRKSt9nothrow_t;
- _Znam; # arm64 x86_64 mips64
- _ZnamRKSt9nothrow_t; # arm64 x86_64 mips64
- _Znwm; # arm64 x86_64 mips64
- _ZnwmRKSt9nothrow_t; # arm64 x86_64 mips64
+ _ZdaPv; # weak
+ _ZdaPvRKSt9nothrow_t; # weak
+ _ZdlPv; # weak
+ _ZdlPvRKSt9nothrow_t; # weak
+ _Znam; # arm64 x86_64 mips64 weak
+ _ZnamRKSt9nothrow_t; # arm64 x86_64 mips64 weak
+ _Znwm; # arm64 x86_64 mips64 weak
+ _ZnwmRKSt9nothrow_t; # arm64 x86_64 mips64 weak
__cxa_guard_abort;
__cxa_guard_acquire;
__cxa_guard_release;
diff --git a/libc/libstdc++.map.txt b/libc/libstdc++.map.txt
index 32d5d49..0a242d5 100644
--- a/libc/libstdc++.map.txt
+++ b/libc/libstdc++.map.txt
@@ -1,18 +1,18 @@
LIBC_O {
global:
_ZSt7nothrow; # var
- _ZdaPv;
- _ZdaPvRKSt9nothrow_t;
- _ZdlPv;
- _ZdlPvRKSt9nothrow_t;
- _Znaj; # arm x86 mips
- _ZnajRKSt9nothrow_t; # arm x86 mips
- _Znam; # arm64 x86_64 mips64
- _ZnamRKSt9nothrow_t; # arm64 x86_64 mips64
- _Znwj; # arm x86 mips
- _ZnwjRKSt9nothrow_t; # arm x86 mips
- _Znwm; # arm64 x86_64 mips64
- _ZnwmRKSt9nothrow_t; # arm64 x86_64 mips64
+ _ZdaPv; # weak
+ _ZdaPvRKSt9nothrow_t; # weak
+ _ZdlPv; # weak
+ _ZdlPvRKSt9nothrow_t; # weak
+ _Znaj; # arm x86 mips weak
+ _ZnajRKSt9nothrow_t; # arm x86 mips weak
+ _Znam; # arm64 x86_64 mips64 weak
+ _ZnamRKSt9nothrow_t; # arm64 x86_64 mips64 weak
+ _Znwj; # arm x86 mips weak
+ _ZnwjRKSt9nothrow_t; # arm x86 mips weak
+ _Znwm; # arm64 x86_64 mips64 weak
+ _ZnwmRKSt9nothrow_t; # arm64 x86_64 mips64 weak
__cxa_guard_abort;
__cxa_guard_acquire;
__cxa_guard_release;
diff --git a/libc/libstdc++.mips.map b/libc/libstdc++.mips.map
index b6b269d..8ee5863 100644
--- a/libc/libstdc++.mips.map
+++ b/libc/libstdc++.mips.map
@@ -2,14 +2,14 @@
LIBC_O {
global:
_ZSt7nothrow; # var
- _ZdaPv;
- _ZdaPvRKSt9nothrow_t;
- _ZdlPv;
- _ZdlPvRKSt9nothrow_t;
- _Znaj; # arm x86 mips
- _ZnajRKSt9nothrow_t; # arm x86 mips
- _Znwj; # arm x86 mips
- _ZnwjRKSt9nothrow_t; # arm x86 mips
+ _ZdaPv; # weak
+ _ZdaPvRKSt9nothrow_t; # weak
+ _ZdlPv; # weak
+ _ZdlPvRKSt9nothrow_t; # weak
+ _Znaj; # arm x86 mips weak
+ _ZnajRKSt9nothrow_t; # arm x86 mips weak
+ _Znwj; # arm x86 mips weak
+ _ZnwjRKSt9nothrow_t; # arm x86 mips weak
__cxa_guard_abort;
__cxa_guard_acquire;
__cxa_guard_release;
diff --git a/libc/libstdc++.mips64.map b/libc/libstdc++.mips64.map
index d0433c9..cd4f3c3 100644
--- a/libc/libstdc++.mips64.map
+++ b/libc/libstdc++.mips64.map
@@ -2,14 +2,14 @@
LIBC_O {
global:
_ZSt7nothrow; # var
- _ZdaPv;
- _ZdaPvRKSt9nothrow_t;
- _ZdlPv;
- _ZdlPvRKSt9nothrow_t;
- _Znam; # arm64 x86_64 mips64
- _ZnamRKSt9nothrow_t; # arm64 x86_64 mips64
- _Znwm; # arm64 x86_64 mips64
- _ZnwmRKSt9nothrow_t; # arm64 x86_64 mips64
+ _ZdaPv; # weak
+ _ZdaPvRKSt9nothrow_t; # weak
+ _ZdlPv; # weak
+ _ZdlPvRKSt9nothrow_t; # weak
+ _Znam; # arm64 x86_64 mips64 weak
+ _ZnamRKSt9nothrow_t; # arm64 x86_64 mips64 weak
+ _Znwm; # arm64 x86_64 mips64 weak
+ _ZnwmRKSt9nothrow_t; # arm64 x86_64 mips64 weak
__cxa_guard_abort;
__cxa_guard_acquire;
__cxa_guard_release;
diff --git a/libc/libstdc++.x86.map b/libc/libstdc++.x86.map
index b6b269d..8ee5863 100644
--- a/libc/libstdc++.x86.map
+++ b/libc/libstdc++.x86.map
@@ -2,14 +2,14 @@
LIBC_O {
global:
_ZSt7nothrow; # var
- _ZdaPv;
- _ZdaPvRKSt9nothrow_t;
- _ZdlPv;
- _ZdlPvRKSt9nothrow_t;
- _Znaj; # arm x86 mips
- _ZnajRKSt9nothrow_t; # arm x86 mips
- _Znwj; # arm x86 mips
- _ZnwjRKSt9nothrow_t; # arm x86 mips
+ _ZdaPv; # weak
+ _ZdaPvRKSt9nothrow_t; # weak
+ _ZdlPv; # weak
+ _ZdlPvRKSt9nothrow_t; # weak
+ _Znaj; # arm x86 mips weak
+ _ZnajRKSt9nothrow_t; # arm x86 mips weak
+ _Znwj; # arm x86 mips weak
+ _ZnwjRKSt9nothrow_t; # arm x86 mips weak
__cxa_guard_abort;
__cxa_guard_acquire;
__cxa_guard_release;
diff --git a/libc/libstdc++.x86_64.map b/libc/libstdc++.x86_64.map
index d0433c9..cd4f3c3 100644
--- a/libc/libstdc++.x86_64.map
+++ b/libc/libstdc++.x86_64.map
@@ -2,14 +2,14 @@
LIBC_O {
global:
_ZSt7nothrow; # var
- _ZdaPv;
- _ZdaPvRKSt9nothrow_t;
- _ZdlPv;
- _ZdlPvRKSt9nothrow_t;
- _Znam; # arm64 x86_64 mips64
- _ZnamRKSt9nothrow_t; # arm64 x86_64 mips64
- _Znwm; # arm64 x86_64 mips64
- _ZnwmRKSt9nothrow_t; # arm64 x86_64 mips64
+ _ZdaPv; # weak
+ _ZdaPvRKSt9nothrow_t; # weak
+ _ZdlPv; # weak
+ _ZdlPvRKSt9nothrow_t; # weak
+ _Znam; # arm64 x86_64 mips64 weak
+ _ZnamRKSt9nothrow_t; # arm64 x86_64 mips64 weak
+ _Znwm; # arm64 x86_64 mips64 weak
+ _ZnwmRKSt9nothrow_t; # arm64 x86_64 mips64 weak
__cxa_guard_abort;
__cxa_guard_acquire;
__cxa_guard_release;