commit 165b1cf57bab5db9716ea79e546d329b46159a3f
author Yi Kong <yikong@google.com> Wed Feb 13 14:10:10 2019 -0800
committer Yi Kong <yikong@google.com> Fri Feb 15 12:46:19 2019 -0800
tree 9b075d69a23f65dd1aef96f88f23191754dc8929
parent be9b7240c2a5db3b9a23f37b57dc7513f64ad114

Switch libc to libcrt.builtins

With the switch to libcrt.builtins, some symbols no longer becomes
exported. Add dummy references to them to force them to be exported.
This is to maintain backwards binary compatibility with ancient Android
versions.

x86 and x86_64 crashes with libcrt, keep using libgcc for now.

Test: bionic-unit-tests
Bug: 29275768
Bug: 122993569
Change-Id: Ieab5af354e3924af4a03d888b28c6e75090cb613

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 1487975..489918b 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -77,8 +77,15 @@
     native_coverage: false,
     recovery_available: true,
 
+    arch: {
+        x86: {
+            no_libcrt: true,
+        },
+        x86_64: {
+            no_libcrt: true,
+        },
+    },
     // TODO(ivanlozano): Remove after b/118321713
-    no_libcrt: true,
     xom: false,
 }
 
@@ -765,7 +772,7 @@
                 "arch-arm/bionic/atomics_arm.c",
                 "arch-arm/bionic/__bionic_clone.S",
                 "arch-arm/bionic/_exit_with_stack_teardown.S",
-                "arch-arm/bionic/libgcc_compat.c",
+                "arch-arm/bionic/libcrt_compat.c",
                 "arch-arm/bionic/popcount_tab.c",
                 "arch-arm/bionic/__restore.S",
                 "arch-arm/bionic/setjmp.S",
@@ -849,7 +856,7 @@
                 "arch-mips/bionic/__bionic_clone.S",
                 "arch-mips/bionic/cacheflush.cpp",
                 "arch-mips/bionic/_exit_with_stack_teardown.S",
-                "arch-mips/bionic/libgcc_compat.c",
+                "arch-mips/bionic/libcrt_compat.c",
                 "arch-mips/bionic/setjmp.S",
                 "arch-mips/bionic/syscall.S",
                 "arch-mips/bionic/vfork.S",
@@ -919,7 +926,7 @@
 
                 "arch-x86/bionic/__bionic_clone.S",
                 "arch-x86/bionic/_exit_with_stack_teardown.S",
-                "arch-x86/bionic/libgcc_compat.c",
+                "arch-x86/bionic/libcrt_compat.c",
                 "arch-x86/bionic/__restore.S",
                 "arch-x86/bionic/setjmp.S",
                 "arch-x86/bionic/syscall.S",