commit 1e1c46c6e13dbef9f8bab33afd1b78e686f41156
author Ben Cheng <bccheng@google.com> Mon Jan 14 15:07:01 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 14 15:07:01 2013 -0800
tree fb793c4e9036a60a071acd1696f3f9cb27d70d4b
parent ca4f96c0f1fcf7a2bdc5a432b751befff149f73d
parent c055e4e701f7c96f2a0b4cdd835bbf75427d5e68

Merge "Add HAS_HW_DIV to control the compilation of __udivsi3."

lib/ExecutionEngine/Android.mk

diff --git a/lib/ExecutionEngine/Android.mk b/lib/ExecutionEngine/Android.mk
index d5a4573..1666f87 100644
--- a/lib/ExecutionEngine/Android.mk
+++ b/lib/ExecutionEngine/Android.mk
@@ -48,6 +48,10 @@
 
 LOCAL_SRC_FILES := $(libbcc_executionengine_SRC_FILES)
 
+ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a15)
+LOCAL_CFLAGS += -DHAS_HW_DIV
+endif
+
 include $(LIBBCC_DEVICE_BUILD_MK)
 include $(LIBBCC_GEN_CONFIG_MK)
 include $(LLVM_DEVICE_BUILD_MK)

runtime/lib/divsi3.c

diff --git a/runtime/lib/divsi3.c b/runtime/lib/divsi3.c
index de1700a..3ab82f0 100644
--- a/runtime/lib/divsi3.c
+++ b/runtime/lib/divsi3.c
@@ -12,7 +12,10 @@
  * ===----------------------------------------------------------------------===
  */
 
-#if !defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) // gcc >= 4.8 implements this in libgcc
+#if !defined(__GNUC__) || __GNUC__ < 4 || \
+    (__GNUC__ == 4 && __GNUC_MINOR__ < 8 && !defined(HAS_HW_DIV))
+// gcc >= 4.8 implements this in libgcc
+// gcc 4.7 also implements this in libgcc with -mcpu=cortex-a15
 #include "int_lib.h"
 
 su_int __udivsi3(su_int n, su_int d);