commit 6d504c6bc5a724466da17fb203a4ea98b199bcdc
author Jason parks <jparks@google.com> Wed Jan 05 13:14:49 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 05 13:14:49 2011 -0800
tree 78ba98ff52185fbc89715c8972991238ac101a68
parent 7fcc6d6a0095be03edb781855994392d08711c8c
parent a1e48dc30fba25c6e7a5160f22aafc381b959b05

Merge "Add the CryptKeeper to the build."

core/combo/TARGET_linux-arm.mk

diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index bc398c3..abeaf95 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -60,8 +60,7 @@
 TARGET_arm_CFLAGS :=    -O2 \
                         -fomit-frame-pointer \
                         -fstrict-aliasing    \
-                        -funswitch-loops     \
-                        -finline-limit=300
+                        -funswitch-loops
 
 # Modules can choose to compile some source as thumb. As
 # non-thumb enabled targets are supported, this is treated
@@ -71,8 +70,7 @@
 TARGET_thumb_CFLAGS :=  -mthumb \
                         -Os \
                         -fomit-frame-pointer \
-                        -fno-strict-aliasing \
-                        -finline-limit=64
+                        -fno-strict-aliasing
 else
 TARGET_thumb_CFLAGS := $(TARGET_arm_CFLAGS)
 endif
@@ -143,8 +141,6 @@
 			-DNDEBUG \
 			-g \
 			-Wstrict-aliasing=2 \
-			-finline-functions \
-			-fno-inline-functions-called-once \
 			-fgcse-after-reload \
 			-frerun-cse-after-loop \
 			-frename-registers