diff options
| author | Dehao Chen <dehao@google.com> | 2014-07-23 14:28:58 -0700 |
|---|---|---|
| committer | Dehao Chen <dehao@google.com> | 2014-07-23 16:23:46 -0700 |
| commit | 25671e15cc1b199ca693f95864ab93a63909a526 (patch) | |
| tree | 48e87ff3bb3b44e80ef2f6d7516223e75c14c536 /core/combo/TARGET_linux-x86.mk | |
| parent | 6693649a42177484c6439912c1d56712378a851c (diff) | |
| download | build-25671e15cc1b199ca693f95864ab93a63909a526.zip build-25671e15cc1b199ca693f95864ab93a63909a526.tar.gz build-25671e15cc1b199ca693f95864ab93a63909a526.tar.bz2 | |
Refactor FDO support code to ensure arm64 can also be built with FDO.
Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
Diffstat (limited to 'core/combo/TARGET_linux-x86.mk')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 2ca99ef..18331d5 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -41,7 +41,7 @@ $(error Unknown $(TARGET_$(combo_2nd_arch_prefix)ARCH) architecture version: $(T endif include $(TARGET_ARCH_SPECIFIC_MAKEFILE) - +include $(BUILD_SYSTEM)/combo/fdo.mk # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else ifeq ($(strip $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)),) @@ -72,34 +72,6 @@ libc_root := bionic/libc libm_root := bionic/libm libstdc++_root := bionic/libstdc++ -# Define FDO (Feedback Directed Optimization) options. - -$(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS:= -$(combo_2nd_arch_prefix)TARGET_FDO_LIB:= - -ifneq ($(strip $(BUILD_FDO_INSTRUMENT)),) - # Set BUILD_FDO_INSTRUMENT=true to turn on FDO instrumentation. - # The profile will be generated on /data/local/tmp/profile on the device. - $(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS := -fprofile-generate=/data/local/tmp/profile -DANDROID_FDO - $(combo_2nd_arch_prefix)TARGET_FDO_LIB := $(target_libgcov) -else - # If BUILD_FDO_INSTRUMENT is turned off, then consider doing the FDO optimizations. - # Set TARGET_FDO_PROFILE_PATH to set a custom profile directory for your build. - ifeq ($(strip $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH)),) - $(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH := fdo/profiles/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT) - else - ifeq ($(strip $(wildcard $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH))),) - $(warning Custom $(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH supplied, but directory does not exist. Turn off FDO.) - endif - endif - - # If the FDO profile directory can't be found, then FDO is off. - ifneq ($(strip $(wildcard $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH))),) - $(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS := -fprofile-use=$($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH) -DANDROID_FDO - $(combo_2nd_arch_prefix)TARGET_FDO_LIB := $(target_libgcov) - endif -endif - KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64. KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) |