commit 81fca35672df90e2f770e67bbf7e7735c6ff8bd8
author Christopher Ferris <cferris@google.com> Mon Oct 06 23:45:02 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 06 23:45:03 2014 +0000
tree f55f73366613064b0cebbc046649c156c68dc28d
parent b5cba6081bc9179d3ea2aa1bfd77dd8de1c88525
parent 6869d26ad9f0e42f7b8ca0a8a331e6119759d211

Merge "Force export symbols on all x86 variants in libc."

libc/arch-x86/bionic/libgcc_compat.c

diff --git a/libc/arch-x86/bionic/libgcc_compat.c b/libc/arch-x86/bionic/libgcc_compat.c
new file mode 100644
index 0000000..c723263
--- /dev/null
+++ b/libc/arch-x86/bionic/libgcc_compat.c
@@ -0,0 +1,15 @@
+/* Generated by genlibgcc_compat.py */
+
+extern char __divdi3;
+extern char __moddi3;
+extern char __popcountsi2;
+extern char __udivdi3;
+extern char __umoddi3;
+
+void* __bionic_libgcc_compat_symbols[] = {
+    &__divdi3,
+    &__moddi3,
+    &__popcountsi2,
+    &__udivdi3,
+    &__umoddi3,
+};

libc/arch-x86/x86.mk

diff --git a/libc/arch-x86/x86.mk b/libc/arch-x86/x86.mk
index 9f2188c..e73ed1d 100644
--- a/libc/arch-x86/x86.mk
+++ b/libc/arch-x86/x86.mk
@@ -38,6 +38,7 @@
 libc_bionic_src_files_x86 += \
     arch-x86/bionic/__bionic_clone.S \
     arch-x86/bionic/_exit_with_stack_teardown.S \
+    arch-x86/bionic/libgcc_compat.c \
     arch-x86/bionic/__restore_rt.S \
     arch-x86/bionic/__restore.S \
     arch-x86/bionic/_setjmp.S \

libc/tools/genlibgcc_compat.py

diff --git a/libc/tools/genlibgcc_compat.py b/libc/tools/genlibgcc_compat.py
index cb5c3b3..628bf92 100755
--- a/libc/tools/genlibgcc_compat.py
+++ b/libc/tools/genlibgcc_compat.py
@@ -76,9 +76,6 @@
 class Generator:
     def process(self):
         android_build_top_path = os.environ["ANDROID_BUILD_TOP"]
-        build_path =  android_build_top_path + "/bionic/libc"
-        file_name = "libgcc_compat.c"
-        file_path = build_path + "/arch-arm/bionic/" + file_name
 
         print "* ANDROID_BUILD_TOP=" + android_build_top_path
 
@@ -86,8 +83,12 @@
         arch = subprocess.check_output(["CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core make --no-print-directory -f build/core/config.mk dumpvar-TARGET_ARCH"],
                     cwd=android_build_top_path, shell=True).strip()
 
-        if arch != 'arm':
-            sys.exit("Error: Invalid TARGET_ARCH='" + arch + "' expecting 'arm'")
+        if arch != 'arm' and arch != 'x86':
+            sys.exit("Error: Invalid TARGET_ARCH='" + arch + "' expecting 'arm' or 'x86'")
+
+        build_path =  android_build_top_path + "/bionic/libc"
+        file_name = "libgcc_compat.c"
+        file_path = build_path + "/arch-" + arch + "/bionic/" + file_name
 
         build_output_file_path = tempfile.mkstemp()[1]