summaryrefslogtreecommitdiff
blob: 4df2a5ce30a74153814d7a6b688cea3b2dcc7dbc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
Index: bionic-8.1.0_p41/external/libcxx/Android.bp
===================================================================
--- bionic-8.1.0_p41.orig/external/libcxx/Android.bp
+++ bionic-8.1.0_p41/external/libcxx/Android.bp
@@ -87,6 +87,7 @@ cc_library_shared {
     target: {
         android: {
             shared_libs: ["libdl"],
+            ldflags: ["-Wl,-lgcc_s"],
         },
         android_arm: {
             static_libs: ["libunwind_llvm"],
Index: bionic-8.1.0_p41/external/libunwind/Android.bp
===================================================================
--- bionic-8.1.0_p41.orig/external/libunwind/Android.bp
+++ bionic-8.1.0_p41/external/libunwind/Android.bp
@@ -404,6 +404,7 @@ cc_library {
     target: {
         android: {
             shared_libs: ["libdl"],
+            ldflags: ["-Wl,-lgcc_s"],
         },
         linux: {
             ldflags: ["-nostdlib"],
Index: bionic-8.1.0_p41/bionic/linker/Android.bp
===================================================================
--- bionic-8.1.0_p41.orig/bionic/linker/Android.bp
+++ bionic-8.1.0_p41/bionic/linker/Android.bp
@@ -148,9 +148,11 @@ cc_binary {
     target: {
         android: {
             static_libs: ["libdebuggerd_client"],
+            ldflags: ["-Wl,-lgcc_s"],
         },
         android64: {
             cflags: ["-DTARGET_IS_64_BIT"],
+            ldflags: ["-Wl,-lgcc_s"],
         },
         linux_bionic: {
             cflags: ["-DTARGET_IS_64_BIT"],