diff options
| author | Jing Yu <jingyu@google.com> | 2011-01-05 11:56:25 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-05 11:56:25 -0800 |
| commit | 7fcc6d6a0095be03edb781855994392d08711c8c (patch) | |
| tree | c801f70df7f44d095573b28a12c5adbec1933334 | |
| parent | 3781dcfc26fa7f42956a45f61b8829809066ea2d (diff) | |
| parent | a83b769566550e30b368836e77b5ac3286844768 (diff) | |
| download | build-7fcc6d6a0095be03edb781855994392d08711c8c.zip build-7fcc6d6a0095be03edb781855994392d08711c8c.tar.gz build-7fcc6d6a0095be03edb781855994392d08711c8c.tar.bz2 | |
Merge "Remove global inline options."
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 8 |
1 files changed, 2 insertions, 6 deletions
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_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined 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 @@ ifeq ($(ARCH_ARM_HAVE_THUMB_SUPPORT),true) 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 @@ TARGET_RELEASE_CFLAGS := \ -DNDEBUG \ -g \ -Wstrict-aliasing=2 \ - -finline-functions \ - -fno-inline-functions-called-once \ -fgcse-after-reload \ -frerun-cse-after-loop \ -frename-registers |