From 06afc1c5ab9e07094832e790249586a7619d9539 Mon Sep 17 00:00:00 2001 From: Raghu Gandham Date: Wed, 25 Jul 2012 19:57:22 -0700 Subject: [PATCH] Support for MIPS Build targets. Change-Id: I14c27305298ce36d5c100abf25489275c2269c5f Signed-off-by: Chris Dearman Signed-off-by: Raghu Gandham --- core/combo/TARGET_linux-mips.mk | 284 +++++++++++++++++++++++ core/combo/arch/mips/mips32-fp.mk | 14 ++ core/combo/arch/mips/mips32.mk | 12 + core/combo/arch/mips/mips32r2-fp.mk | 14 ++ core/combo/arch/mips/mips32r2.mk | 12 + core/combo/arch/mips/mips32r2dsp-fp.mk | 17 ++ core/combo/arch/mips/mips32r2dsp.mk | 16 ++ core/combo/arch/mips/mips32r2dspr2-fp.mk | 17 ++ core/combo/arch/mips/mips32r2dspr2.mk | 16 ++ 9 files changed, 402 insertions(+) create mode 100644 core/combo/TARGET_linux-mips.mk create mode 100644 core/combo/arch/mips/mips32-fp.mk create mode 100644 core/combo/arch/mips/mips32.mk create mode 100644 core/combo/arch/mips/mips32r2-fp.mk create mode 100644 core/combo/arch/mips/mips32r2.mk create mode 100644 core/combo/arch/mips/mips32r2dsp-fp.mk create mode 100644 core/combo/arch/mips/mips32r2dsp.mk create mode 100644 core/combo/arch/mips/mips32r2dspr2-fp.mk create mode 100644 core/combo/arch/mips/mips32r2dspr2.mk diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk new file mode 100644 index 000000000..a3a891e7e --- /dev/null +++ b/core/combo/TARGET_linux-mips.mk @@ -0,0 +1,284 @@ +# +# Copyright (C) 2010 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# Configuration for Linux on MIPS. +# Included by combo/select.mk + +# You can set TARGET_ARCH_VARIANT to use an arch version other +# than mips32r2-fp. Each value should correspond to a file named +# $(BUILD_COMBOS)/arch/.mk which must contain +# makefile variable definitions similar to the preprocessor +# defines in system/core/include/arch//AndroidConfig.h. Their +# purpose is to allow module Android.mk files to selectively compile +# different versions of code based upon the funtionality and +# instructions available in a given architecture version. +# +# The blocks also define specific arch_variant_cflags, which +# include defines, and compiler settings for the given architecture +# version. +# +ifeq ($(strip $(TARGET_ARCH_VARIANT)),) +TARGET_ARCH_VARIANT := mips32r2-fp +endif + +TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk +ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) +$(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT)) +endif + +include $(TARGET_ARCH_SPECIFIC_MAKEFILE) + +# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else +ifeq ($(strip $(TARGET_TOOLS_PREFIX)),) +TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mipsel-linux-android-4.6 +TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/mipsel-linux-android- +endif + +# Only define these if there's actually a gcc in there. +# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it. +ifneq ($(wildcard $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)),) + TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX) + TARGET_CXX := $(TARGET_TOOLS_PREFIX)g++$(HOST_EXECUTABLE_SUFFIX) + TARGET_AR := $(TARGET_TOOLS_PREFIX)ar$(HOST_EXECUTABLE_SUFFIX) + TARGET_OBJCOPY := $(TARGET_TOOLS_PREFIX)objcopy$(HOST_EXECUTABLE_SUFFIX) + TARGET_LD := $(TARGET_TOOLS_PREFIX)ld$(HOST_EXECUTABLE_SUFFIX) + TARGET_STRIP := $(TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX) + ifeq ($(TARGET_BUILD_VARIANT),user) + TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip-all $< -o $@ + else + TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip-all $< -o $@ && \ + $(TARGET_OBJCOPY) --add-gnu-debuglink=$< $@ + endif +endif + +TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined + +TARGET_mips_CFLAGS := -O2 \ + -fomit-frame-pointer \ + -fno-strict-aliasing \ + -funswitch-loops + +# Set FORCE_MIPS_DEBUGGING to "true" in your buildspec.mk +# or in your environment to gdb debugging easier. +# Don't forget to do a clean build. +ifeq ($(FORCE_MIPS_DEBUGGING),true) + TARGET_mips_CFLAGS += -fno-omit-frame-pointer +endif + +android_config_h := $(call select-android-config-h,linux-mips) +arch_include_dir := $(dir $(android_config_h)) + +TARGET_GLOBAL_CFLAGS += \ + $(TARGET_mips_CFLAGS) \ + -Ulinux -U__unix -U__unix__ -Umips \ + -fpic \ + -ffunction-sections \ + -fdata-sections \ + -funwind-tables \ + -Werror=format-security \ + $(arch_variant_cflags) \ + -include $(android_config_h) \ + -I $(arch_include_dir) + +# This warning causes dalvik not to build with gcc 4.6.x and -Werror. +# We cannot turn it off blindly since the option is not available +# in gcc-4.4.x. +ifneq ($(filter 4.6.%, $(shell $(TARGET_CC) --version)),) +TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable \ + -fno-strict-volatile-bitfields +endif + +# This is to avoid the dreaded warning compiler message: +# note: the mangling of 'va_list' has changed in GCC 4.4 +# +# The fact that the mangling changed does not affect the NDK ABI +# very fortunately (since none of the exposed APIs used va_list +# in their exported C++ functions). Also, GCC 4.5 has already +# removed the warning from the compiler. +# +TARGET_GLOBAL_CFLAGS += -Wno-psabi + +ifneq ($(ARCH_MIPS_PAGE_SHIFT),) +TARGET_GLOBAL_CFLAGS += -DPAGE_SHIFT=$(ARCH_MIPS_PAGE_SHIFT) +endif + +TARGET_GLOBAL_LDFLAGS += \ + $(arch_variant_ldflags) + +TARGET_GLOBAL_CPPFLAGS += -fvisibility-inlines-hidden \ + -fno-use-cxa-atexit + +# More flags/options can be added here +TARGET_RELEASE_CFLAGS := \ + -DNDEBUG \ + -g \ + -Wstrict-aliasing=2 \ + -fgcse-after-reload \ + -frerun-cse-after-loop \ + -frename-registers + +libc_root := bionic/libc +libm_root := bionic/libm +libstdc++_root := bionic/libstdc++ +libthread_db_root := bionic/libthread_db + + +## on some hosts, the target cross-compiler is not available so do not run this command +ifneq ($(wildcard $(TARGET_CC)),) +# We compile with the global cflags to ensure that +# any flags which affect libgcc are correctly taken +# into account. +TARGET_LIBGCC := \ + $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) -print-file-name=libgcc.a) +LIBGCC_EH := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) -print-file-name=libgcc_eh.a) +ifneq ($(LIBGCC_EH),libgcc_eh.a) + TARGET_LIBGCC += $(LIBGCC_EH) +endif +endif + +# Define FDO (Feedback Directed Optimization) options. + +TARGET_FDO_CFLAGS:= +TARGET_FDO_LIB:= + +target_libgcov := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \ + --print-file-name=libgcov.a) +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. + TARGET_FDO_CFLAGS := -fprofile-generate=/data/local/tmp/profile -DANDROID_FDO + 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 $(TARGET_FDO_PROFILE_PATH)),) + TARGET_FDO_PROFILE_PATH := fdo/profiles/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT) + else + ifeq ($(strip $(wildcard $(TARGET_FDO_PROFILE_PATH))),) + $(warning Custom 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 $(TARGET_FDO_PROFILE_PATH))),) + TARGET_FDO_CFLAGS := -fprofile-use=$(TARGET_FDO_PROFILE_PATH) -DANDROID_FDO + TARGET_FDO_LIB := $(target_libgcov) + endif +endif + + +# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use +# symlinks located in out/ to point to the appropriate kernel +# headers. see 'config/kernel_headers.make' for more details +# +ifneq ($(CUSTOM_KERNEL_HEADERS),) + KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS) + KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS) +else + KERNEL_HEADERS_COMMON := $(libc_root)/kernel/common + KERNEL_HEADERS_ARCH := $(libc_root)/kernel/arch-$(TARGET_ARCH) +endif +KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) + +TARGET_C_INCLUDES := \ + $(libc_root)/arch-mips/include \ + $(libc_root)/include \ + $(libstdc++_root)/include \ + $(KERNEL_HEADERS) \ + $(libm_root)/include \ + $(libm_root)/include/mips \ + $(libthread_db_root)/include + +TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_static.o +TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_dynamic.o +TARGET_CRTEND_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_android.o + +TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtbegin_so.o +TARGET_CRTEND_SO_O := $(TARGET_OUT_STATIC_LIBRARIES)/crtend_so.o + +TARGET_STRIP_MODULE:=true + +TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm + +TARGET_CUSTOM_LD_COMMAND := true + +# Enable the Dalvik JIT compiler if not already specified. +ifeq ($(strip $(WITH_JIT)),) + WITH_JIT := true +endif + +define transform-o-to-shared-lib-inner +$(hide) $(PRIVATE_CXX) \ + -nostdlib -Wl,-soname,$(notdir $@) \ + -Wl,--gc-sections \ + -shared -Bsymbolic \ + $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ + $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ + -Wl,--no-whole-archive \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ + $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ + $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ + -o $@ \ + $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ + $(PRIVATE_TARGET_FDO_LIB) \ + $(PRIVATE_TARGET_LIBGCC) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) +endef + +define transform-o-to-executable-inner +$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic \ + -Wl,-dynamic-linker,/system/bin/linker \ + -Wl,--gc-sections \ + -Wl,-z,nocopyreloc \ + -o $@ \ + $(TARGET_GLOBAL_LD_DIRS) \ + -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ + $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_DYNAMIC_O)) \ + $(PRIVATE_ALL_OBJECTS) \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ + $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ + $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ + $(TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ + $(TARGET_FDO_LIB) \ + $(TARGET_LIBGCC) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O)) +endef + +define transform-o-to-static-executable-inner +$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ + -Wl,--gc-sections \ + -o $@ \ + $(TARGET_GLOBAL_LD_DIRS) \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTBEGIN_STATIC_O)) \ + $(TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ + $(PRIVATE_ALL_OBJECTS) \ + $(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \ + -Wl,--start-group \ + $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ + $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ + $(TARGET_FDO_LIB) \ + $(TARGET_LIBGCC) \ + -Wl,--end-group \ + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(TARGET_CRTEND_O)) +endef diff --git a/core/combo/arch/mips/mips32-fp.mk b/core/combo/arch/mips/mips32-fp.mk new file mode 100644 index 000000000..e60bdacd2 --- /dev/null +++ b/core/combo/arch/mips/mips32-fp.mk @@ -0,0 +1,14 @@ +# Configuration for Android on MIPS. +# Generating binaries for MIPS32/hard-float/little-endian + +ARCH_MIPS_HAS_FPU :=true +ARCH_HAVE_ALIGNED_DOUBLES :=true +arch_variant_cflags := \ + -EL \ + -march=mips32 \ + -mtune=mips32 \ + -mips32 \ + -mhard-float + +arch_variant_ldflags := \ + -EL diff --git a/core/combo/arch/mips/mips32.mk b/core/combo/arch/mips/mips32.mk new file mode 100644 index 000000000..35ef0d8a0 --- /dev/null +++ b/core/combo/arch/mips/mips32.mk @@ -0,0 +1,12 @@ +# Configuration for Android on MIPS. +# Generating binaries for MIPS32/soft-float/little-endian + +arch_variant_cflags := \ + -EL \ + -march=mips32 \ + -mtune=mips32 \ + -mips32 \ + -msoft-float + +arch_variant_ldflags := \ + -EL diff --git a/core/combo/arch/mips/mips32r2-fp.mk b/core/combo/arch/mips/mips32r2-fp.mk new file mode 100644 index 000000000..a407f0035 --- /dev/null +++ b/core/combo/arch/mips/mips32r2-fp.mk @@ -0,0 +1,14 @@ +# Configuration for Android on MIPS. +# Generating binaries for MIPS32R2/hard-float/little-endian + +ARCH_MIPS_HAS_FPU :=true +ARCH_HAVE_ALIGNED_DOUBLES :=true +arch_variant_cflags := \ + -EL \ + -march=mips32r2 \ + -mtune=mips32r2 \ + -mips32r2 \ + -mhard-float + +arch_variant_ldflags := \ + -EL diff --git a/core/combo/arch/mips/mips32r2.mk b/core/combo/arch/mips/mips32r2.mk new file mode 100644 index 000000000..369d49981 --- /dev/null +++ b/core/combo/arch/mips/mips32r2.mk @@ -0,0 +1,12 @@ +# Configuration for Android on MIPS. +# Generating binaries for MIPS32R2/soft-float/little-endian + +arch_variant_cflags := \ + -EL \ + -march=mips32r2 \ + -mtune=mips32r2 \ + -mips32r2 \ + -msoft-float + +arch_variant_ldflags := \ + -EL diff --git a/core/combo/arch/mips/mips32r2dsp-fp.mk b/core/combo/arch/mips/mips32r2dsp-fp.mk new file mode 100644 index 000000000..886872d51 --- /dev/null +++ b/core/combo/arch/mips/mips32r2dsp-fp.mk @@ -0,0 +1,17 @@ +# Configuration for Android on MIPS. +# Generating binaries for MIPS32R2/hard-float/little-endian/dsp + +ARCH_MIPS_HAS_DSP :=true +ARCH_MIPS_DSP_REV :=1 +ARCH_MIPS_HAS_FPU :=true +ARCH_HAVE_ALIGNED_DOUBLES :=true +arch_variant_cflags := \ + -EL \ + -march=mips32r2 \ + -mtune=mips32r2 \ + -mips32r2 \ + -mhard-float \ + -mdsp + +arch_variant_ldflags := \ + -EL diff --git a/core/combo/arch/mips/mips32r2dsp.mk b/core/combo/arch/mips/mips32r2dsp.mk new file mode 100644 index 000000000..e67adc7e4 --- /dev/null +++ b/core/combo/arch/mips/mips32r2dsp.mk @@ -0,0 +1,16 @@ +# Configuration for Android on MIPS. +# Generating binaries for MIPS32R2/soft-float/little-endian/dsp + +ARCH_MIPS_HAS_DSP :=true +ARCH_MIPS_DSP_REV :=1 + +arch_variant_cflags := \ + -EL \ + -march=mips32r2 \ + -mtune=mips32r2 \ + -mips32r2 \ + -msoft-float \ + -mdsp + +arch_variant_ldflags := \ + -EL diff --git a/core/combo/arch/mips/mips32r2dspr2-fp.mk b/core/combo/arch/mips/mips32r2dspr2-fp.mk new file mode 100644 index 000000000..27e090dd8 --- /dev/null +++ b/core/combo/arch/mips/mips32r2dspr2-fp.mk @@ -0,0 +1,17 @@ +# Configuration for Android on MIPS. +# Generating binaries for MIPS32R2/hard-float/little-endian/dsp + +ARCH_MIPS_HAS_DSP :=true +ARCH_MIPS_DSP_REV :=2 +ARCH_MIPS_HAS_FPU :=true +ARCH_HAVE_ALIGNED_DOUBLES :=true +arch_variant_cflags := \ + -EL \ + -march=mips32r2 \ + -mtune=mips32r2 \ + -mips32r2 \ + -mhard-float \ + -mdspr2 + +arch_variant_ldflags := \ + -EL diff --git a/core/combo/arch/mips/mips32r2dspr2.mk b/core/combo/arch/mips/mips32r2dspr2.mk new file mode 100644 index 000000000..c493d9a88 --- /dev/null +++ b/core/combo/arch/mips/mips32r2dspr2.mk @@ -0,0 +1,16 @@ +# Configuration for Android on MIPS. +# Generating binaries for MIPS32R2/soft-float/little-endian/dsp + +ARCH_MIPS_HAS_DSP :=true +ARCH_MIPS_DSP_REV :=2 + +arch_variant_cflags := \ + -EL \ + -march=mips32r2 \ + -mtune=mips32r2 \ + -mips32r2 \ + -msoft-float \ + -mdspr2 + +arch_variant_ldflags := \ + -EL