resolve merge conflicts of dfcf2e0 to nyc-dev-plus-aosp
Change-Id: I5473ac42db3dba12dffb1d40eb9096d738ef977b
This commit is contained in:
Dan Willemsen
commit
238f4aafd2
60 changed files with 18 additions and 1190 deletions
|
|
@ -1,39 +1 @@
|
|||
|
||||
include $(BUILD_SYSTEM)/clang/x86.mk
|
||||
|
||||
CLANG_CONFIG_x86_HOST_CROSS_TRIPLE := i686-pc-mingw32
|
||||
|
||||
CLANG_CONFIG_x86_HOST_CROSS_EXTRA_ASFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_CROSS_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_ASFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE)
|
||||
|
||||
CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_CROSS_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_ASFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CONLYFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_CROSS_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CONLYFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CPPFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_CROSS_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_CPPFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_HOST_CROSS_EXTRA_LDFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_CROSS_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_LDFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE)
|
||||
|
||||
$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a
|
||||
|
|
|
|||
|
|
@ -1,39 +1 @@
|
|||
|
||||
include $(BUILD_SYSTEM)/clang/x86_64.mk
|
||||
|
||||
CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE := x86_64-pc-mingw32
|
||||
|
||||
CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_ASFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_CROSS_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_ASFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE)
|
||||
|
||||
CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_CROSS_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_ASFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CONLYFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_CROSS_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CONLYFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CPPFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_CROSS_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CPPFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_LDFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_CROSS_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_LDFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE)
|
||||
|
||||
$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a
|
||||
|
|
|
|||
|
|
@ -1,53 +1 @@
|
|||
|
||||
include $(BUILD_SYSTEM)/clang/x86.mk
|
||||
include $(BUILD_SYSTEM)/clang/HOST_x86_common.mk
|
||||
|
||||
ifeq ($(HOST_OS),linux)
|
||||
CLANG_CONFIG_x86_HOST_TRIPLE := i686-linux-gnu
|
||||
CLANG_CONFIG_x86_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS)
|
||||
CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS)
|
||||
CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS)
|
||||
CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS)
|
||||
endif
|
||||
ifeq ($(HOST_OS),darwin)
|
||||
CLANG_CONFIG_x86_HOST_TRIPLE := i686-apple-darwin
|
||||
CLANG_CONFIG_x86_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS)
|
||||
CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS)
|
||||
CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CPPFLAGS)
|
||||
CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_LDFLAGS)
|
||||
endif
|
||||
|
||||
CLANG_CONFIG_x86_HOST_EXTRA_ASFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_ASFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_HOST_TRIPLE)
|
||||
|
||||
CLANG_CONFIG_x86_HOST_EXTRA_CFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_EXTRA_ASFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_HOST_EXTRA_CONLYFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CONLYFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_HOST_EXTRA_CPPFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_CPPFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_HOST_EXTRA_LDFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_x86_HOST_COMBO_EXTRA_LDFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_HOST_TRIPLE)
|
||||
|
||||
$(clang_2nd_arch_prefix)HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a
|
||||
|
|
|
|||
|
|
@ -1,53 +1 @@
|
|||
|
||||
include $(BUILD_SYSTEM)/clang/x86_64.mk
|
||||
include $(BUILD_SYSTEM)/clang/HOST_x86_common.mk
|
||||
|
||||
ifeq ($(HOST_OS),linux)
|
||||
CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-linux-gnu
|
||||
CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS)
|
||||
CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS)
|
||||
CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS)
|
||||
CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS)
|
||||
endif
|
||||
ifeq ($(HOST_OS),darwin)
|
||||
CLANG_CONFIG_x86_64_HOST_TRIPLE := x86_64-apple-darwin
|
||||
CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_ASFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS)
|
||||
CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS)
|
||||
CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CPPFLAGS)
|
||||
CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS := $(CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_LDFLAGS)
|
||||
endif
|
||||
|
||||
CLANG_CONFIG_x86_64_HOST_EXTRA_ASFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_ASFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_64_HOST_TRIPLE)
|
||||
|
||||
CLANG_CONFIG_x86_64_HOST_EXTRA_CFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_EXTRA_ASFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_64_HOST_EXTRA_CONLYFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CONLYFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_64_HOST_EXTRA_CPPFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_CPPFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_64_HOST_EXTRA_LDFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_HOST_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_HOST_COMBO_EXTRA_LDFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_64_HOST_TRIPLE)
|
||||
|
||||
HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
# Shared by HOST_x86.mk and HOST_x86_64.mk.
|
||||
|
||||
ifeq ($(HOST_OS),darwin)
|
||||
CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS := \
|
||||
-integrated-as
|
||||
|
||||
CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS := \
|
||||
-integrated-as
|
||||
|
||||
CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS += -fstack-protector-strong
|
||||
endif
|
||||
|
||||
ifeq ($(HOST_OS),linux)
|
||||
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \
|
||||
--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
|
||||
--sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
|
||||
-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin
|
||||
|
||||
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \
|
||||
--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)
|
||||
|
||||
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS += -fstack-protector-strong
|
||||
|
||||
ifneq ($(strip $($(clang_2nd_arch_prefix)HOST_IS_64_BIT)),)
|
||||
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
|
||||
-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8 \
|
||||
-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/x86_64-linux \
|
||||
-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward
|
||||
|
||||
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
|
||||
--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
|
||||
--sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
|
||||
-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \
|
||||
-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8 \
|
||||
-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8 \
|
||||
-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64
|
||||
else
|
||||
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
|
||||
-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8 \
|
||||
-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/x86_64-linux/32 \
|
||||
-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward
|
||||
|
||||
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
|
||||
--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
|
||||
--sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
|
||||
-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \
|
||||
-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8/32 \
|
||||
-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8/32 \
|
||||
-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32
|
||||
endif
|
||||
endif # Linux
|
||||
|
|
@ -1,42 +1,3 @@
|
|||
|
||||
include $(BUILD_SYSTEM)/clang/arm.mk
|
||||
|
||||
CLANG_CONFIG_arm_TARGET_TRIPLE := arm-linux-androideabi
|
||||
CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX := \
|
||||
$($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm_TARGET_TRIPLE)/bin
|
||||
|
||||
CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_arm_EXTRA_ASFLAGS) \
|
||||
-target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
CLANG_CONFIG_arm_TARGET_EXTRA_CFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_arm_EXTRA_CFLAGS) \
|
||||
-target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \
|
||||
$(CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS)
|
||||
|
||||
CLANG_CONFIG_arm_TARGET_EXTRA_CONLYFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_arm_EXTRA_CONLYFLAGS)
|
||||
|
||||
CLANG_CONFIG_arm_TARGET_EXTRA_CPPFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_arm_EXTRA_CPPFLAGS)
|
||||
|
||||
CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_arm_EXTRA_LDFLAGS) \
|
||||
-target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=
|
||||
$(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := armv7-none-linux-gnueabi
|
||||
|
|
@ -44,5 +5,4 @@ $(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := armv7-none-linux-gnueabi
|
|||
$(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-arm-android.a
|
||||
|
||||
# Address sanitizer clang config
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-arm-android
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan
|
||||
|
|
|
|||
|
|
@ -1,41 +1,3 @@
|
|||
|
||||
include $(BUILD_SYSTEM)/clang/arm64.mk
|
||||
|
||||
CLANG_CONFIG_arm64_TARGET_TRIPLE := aarch64-linux-android
|
||||
CLANG_CONFIG_arm64_TARGET_TOOLCHAIN_PREFIX := \
|
||||
$(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm64_TARGET_TRIPLE)/bin
|
||||
|
||||
CLANG_CONFIG_arm64_TARGET_EXTRA_ASFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_arm64_EXTRA_ASFLAGS) \
|
||||
-target $(CLANG_CONFIG_arm64_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_arm64_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
CLANG_CONFIG_arm64_TARGET_EXTRA_CFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_arm64_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_arm64_TARGET_EXTRA_ASFLAGS)
|
||||
|
||||
CLANG_CONFIG_arm64_TARGET_EXTRA_CONLYFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_arm64_EXTRA_CONLYFLAGS)
|
||||
|
||||
CLANG_CONFIG_arm64_TARGET_EXTRA_CPPFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_arm64_EXTRA_CPPFLAGS) \
|
||||
|
||||
CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_arm64_EXTRA_LDFLAGS) \
|
||||
-target $(CLANG_CONFIG_arm64_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_arm64_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
|
||||
RS_TRIPLE := aarch64-linux-android
|
||||
RS_TRIPLE_CFLAGS :=
|
||||
RS_COMPAT_TRIPLE := aarch64-linux-android
|
||||
|
|
@ -43,5 +5,4 @@ RS_COMPAT_TRIPLE := aarch64-linux-android
|
|||
TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-aarch64-android.a
|
||||
|
||||
# Address sanitizer clang config
|
||||
ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-aarch64-android
|
||||
ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan64
|
||||
|
|
|
|||
|
|
@ -1,42 +1,3 @@
|
|||
|
||||
include $(BUILD_SYSTEM)/clang/mips.mk
|
||||
|
||||
CLANG_CONFIG_mips_TARGET_TRIPLE := mipsel-linux-android
|
||||
CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX := \
|
||||
$($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/mips64el-linux-android/bin
|
||||
|
||||
CLANG_CONFIG_mips_TARGET_EXTRA_ASFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_mips_EXTRA_ASFLAGS) \
|
||||
-fPIC \
|
||||
-target $(CLANG_CONFIG_mips_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
CLANG_CONFIG_mips_TARGET_EXTRA_CFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_mips_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_mips_TARGET_EXTRA_ASFLAGS)
|
||||
|
||||
CLANG_CONFIG_mips_TARGET_EXTRA_CONLYFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_mips_EXTRA_CONLYFLAGS)
|
||||
|
||||
CLANG_CONFIG_mips_TARGET_EXTRA_CPPFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_mips_EXTRA_CPPFLAGS) \
|
||||
|
||||
CLANG_CONFIG_mips_TARGET_EXTRA_LDFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_mips_EXTRA_LDFLAGS) \
|
||||
-target $(CLANG_CONFIG_mips_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=
|
||||
RS_COMPAT_TRIPLE := mipsel-linux-android
|
||||
|
|
@ -44,5 +5,4 @@ RS_COMPAT_TRIPLE := mipsel-linux-android
|
|||
$(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-mipsel-android.a
|
||||
|
||||
# Address sanitizer clang config
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-mips-android
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan
|
||||
|
|
|
|||
|
|
@ -1,41 +1,3 @@
|
|||
|
||||
include $(BUILD_SYSTEM)/clang/mips64.mk
|
||||
|
||||
CLANG_CONFIG_mips64_TARGET_TRIPLE := mips64el-linux-android
|
||||
CLANG_CONFIG_mips64_TARGET_TOOLCHAIN_PREFIX := \
|
||||
$(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_mips64_TARGET_TRIPLE)/bin
|
||||
|
||||
CLANG_CONFIG_mips64_TARGET_EXTRA_ASFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_mips64_EXTRA_ASFLAGS) \
|
||||
-target $(CLANG_CONFIG_mips64_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_mips64_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
CLANG_CONFIG_mips64_TARGET_EXTRA_CFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_mips64_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_mips64_TARGET_EXTRA_ASFLAGS)
|
||||
|
||||
CLANG_CONFIG_mips64_TARGET_EXTRA_CONLYFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_mips64_EXTRA_CONLYFLAGS)
|
||||
|
||||
CLANG_CONFIG_mips64_TARGET_EXTRA_CPPFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_mips64_EXTRA_CPPFLAGS) \
|
||||
|
||||
CLANG_CONFIG_mips64_TARGET_EXTRA_LDFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_mips64_EXTRA_LDFLAGS) \
|
||||
-target $(CLANG_CONFIG_mips64_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_mips64_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
|
||||
RS_TRIPLE := aarch64-linux-android
|
||||
RS_TRIPLE_CFLAGS :=
|
||||
RS_COMPAT_TRIPLE := mips64el-linux-android
|
||||
|
|
@ -43,5 +5,4 @@ RS_COMPAT_TRIPLE := mips64el-linux-android
|
|||
TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-mips64el-android.a
|
||||
|
||||
# Address sanitizer clang config
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-mips64-android
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan64
|
||||
|
|
|
|||
|
|
@ -1,48 +1,3 @@
|
|||
|
||||
include $(BUILD_SYSTEM)/clang/x86.mk
|
||||
|
||||
CLANG_CONFIG_x86_TARGET_TRIPLE := i686-linux-android
|
||||
# NOTE: There is no i686-linux-android prebuilt, so we must hardcode the
|
||||
# x86_64 target instead.
|
||||
CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX := \
|
||||
$($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin
|
||||
|
||||
CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
CLANG_CONFIG_x86_TARGET_EXTRA_CFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS) \
|
||||
-mstackrealign
|
||||
|
||||
# -mstackrealign is needed to realign stack in native code
|
||||
# that could be called from JNI, so that movaps instruction
|
||||
# will work on assumed stack aligned local variables.
|
||||
|
||||
CLANG_CONFIG_x86_TARGET_EXTRA_CONLYFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_CONLYFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_TARGET_EXTRA_CPPFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \
|
||||
|
||||
CLANG_CONFIG_x86_TARGET_EXTRA_LDFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__
|
||||
$(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := i686-linux-android
|
||||
|
|
@ -50,5 +5,4 @@ $(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := i686-linux-android
|
|||
$(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686-android.a
|
||||
|
||||
# Address sanitizer clang config
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-i686-android
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan
|
||||
|
|
|
|||
|
|
@ -1,41 +1,3 @@
|
|||
|
||||
include $(BUILD_SYSTEM)/clang/x86_64.mk
|
||||
|
||||
CLANG_CONFIG_x86_64_TARGET_TRIPLE := x86_64-linux-android
|
||||
CLANG_CONFIG_x86_64_TARGET_TOOLCHAIN_PREFIX := \
|
||||
$(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_x86_64_TARGET_TRIPLE)/bin
|
||||
|
||||
CLANG_CONFIG_x86_64_TARGET_EXTRA_ASFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_ASFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_64_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_x86_64_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
CLANG_CONFIG_x86_64_TARGET_EXTRA_CFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_CFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_TARGET_EXTRA_ASFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_64_TARGET_EXTRA_CONLYFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CONLYFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_CONLYFLAGS)
|
||||
|
||||
CLANG_CONFIG_x86_64_TARGET_EXTRA_CPPFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_CPPFLAGS) \
|
||||
|
||||
CLANG_CONFIG_x86_64_TARGET_EXTRA_LDFLAGS := \
|
||||
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \
|
||||
$(CLANG_CONFIG_x86_64_EXTRA_LDFLAGS) \
|
||||
-target $(CLANG_CONFIG_x86_64_TARGET_TRIPLE) \
|
||||
-B$(CLANG_CONFIG_x86_64_TARGET_TOOLCHAIN_PREFIX)
|
||||
|
||||
|
||||
RS_TRIPLE := aarch64-linux-android
|
||||
RS_TRIPLE_CFLAGS := -D__x86_64__
|
||||
RS_COMPAT_TRIPLE := x86_64-linux-android
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
# Clang flags for arm arch, target or host.
|
||||
|
||||
CLANG_CONFIG_arm_EXTRA_ASFLAGS :=
|
||||
|
||||
CLANG_CONFIG_arm_EXTRA_CFLAGS :=
|
||||
|
||||
CLANG_CONFIG_arm_EXTRA_CPPFLAGS :=
|
||||
|
||||
CLANG_CONFIG_arm_EXTRA_LDFLAGS :=
|
||||
|
||||
ifneq (,$(filter krait,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
|
||||
# Android's clang support's krait as a CPU whereas GCC doesn't. Specify
|
||||
# -mcpu here rather than the more normal core/combo/arch/arm/armv7-a-neon.mk.
|
||||
CLANG_CONFIG_arm_EXTRA_CFLAGS += -mcpu=krait -mfpu=neon-vfpv4
|
||||
endif
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
# Clang flags for arm64 arch, target or host.
|
||||
|
||||
CLANG_CONFIG_arm64_EXTRA_ASFLAGS :=
|
||||
|
||||
CLANG_CONFIG_arm64_EXTRA_CFLAGS :=
|
||||
|
||||
CLANG_CONFIG_arm64_EXTRA_LDFLAGS :=
|
||||
|
|
@ -16,48 +16,6 @@ RS_CLANG := $(RS_LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)
|
|||
RS_LLVM_AS := $(RS_LLVM_PREBUILTS_PATH)/llvm-as$(BUILD_EXECUTABLE_SUFFIX)
|
||||
RS_LLVM_LINK := $(RS_LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX)
|
||||
|
||||
# Clang flags for all host or target rules
|
||||
CLANG_CONFIG_EXTRA_ASFLAGS :=
|
||||
CLANG_CONFIG_EXTRA_CFLAGS :=
|
||||
CLANG_CONFIG_EXTRA_CONLYFLAGS := -std=gnu99
|
||||
CLANG_CONFIG_EXTRA_CPPFLAGS :=
|
||||
CLANG_CONFIG_EXTRA_LDFLAGS :=
|
||||
|
||||
CLANG_CONFIG_EXTRA_CFLAGS += \
|
||||
-D__compiler_offsetof=__builtin_offsetof
|
||||
|
||||
# Help catch common 32/64-bit errors.
|
||||
CLANG_CONFIG_EXTRA_CFLAGS += \
|
||||
-Werror=int-conversion
|
||||
|
||||
# Disable overly aggressive warning for macros defined with a leading underscore
|
||||
# This used to happen in AndroidConfig.h, which was included everywhere.
|
||||
# TODO: can we remove this now?
|
||||
CLANG_CONFIG_EXTRA_CFLAGS += \
|
||||
-Wno-reserved-id-macro
|
||||
|
||||
# Disable overly aggressive warning for format strings.
|
||||
# Bug: 20148343
|
||||
CLANG_CONFIG_EXTRA_CFLAGS += \
|
||||
-Wno-format-pedantic
|
||||
|
||||
# Workaround for ccache with clang.
|
||||
# See http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html.
|
||||
CLANG_CONFIG_EXTRA_CFLAGS += \
|
||||
-Wno-unused-command-line-argument
|
||||
|
||||
# Disable -Winconsistent-missing-override until we can clean up the existing
|
||||
# codebase for it.
|
||||
CLANG_CONFIG_EXTRA_CPPFLAGS += \
|
||||
-Wno-inconsistent-missing-override
|
||||
|
||||
# Force clang to always output color diagnostics. Ninja will strip the ANSI
|
||||
# color codes if it is not running in a terminal.
|
||||
ifdef BUILDING_WITH_NINJA
|
||||
CLANG_CONFIG_EXTRA_CFLAGS += \
|
||||
-fcolor-diagnostics
|
||||
endif
|
||||
|
||||
CLANG_CONFIG_UNKNOWN_CFLAGS := \
|
||||
-finline-functions \
|
||||
-finline-limit=64 \
|
||||
|
|
@ -110,24 +68,6 @@ define convert-to-clang-flags
|
|||
$(strip $(filter-out $(CLANG_CONFIG_UNKNOWN_CFLAGS),$(1)))
|
||||
endef
|
||||
|
||||
# Clang flags for all host rules
|
||||
CLANG_CONFIG_HOST_EXTRA_ASFLAGS :=
|
||||
CLANG_CONFIG_HOST_EXTRA_CFLAGS :=
|
||||
CLANG_CONFIG_HOST_EXTRA_CPPFLAGS :=
|
||||
CLANG_CONFIG_HOST_EXTRA_LDFLAGS :=
|
||||
|
||||
# Clang flags for all host cross rules
|
||||
CLANG_CONFIG_HOST_CROSS_EXTRA_ASFLAGS :=
|
||||
CLANG_CONFIG_HOST_CROSS_EXTRA_CFLAGS :=
|
||||
CLANG_CONFIG_HOST_CROSS_EXTRA_CPPFLAGS :=
|
||||
CLANG_CONFIG_HOST_CROSS_EXTRA_LDFLAGS :=
|
||||
|
||||
# Clang flags for all target rules
|
||||
CLANG_CONFIG_TARGET_EXTRA_ASFLAGS :=
|
||||
CLANG_CONFIG_TARGET_EXTRA_CFLAGS := -nostdlibinc
|
||||
CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS :=
|
||||
CLANG_CONFIG_TARGET_EXTRA_LDFLAGS :=
|
||||
|
||||
CLANG_DEFAULT_UB_CHECKS := \
|
||||
bool \
|
||||
integer-divide-by-zero \
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
# Clang flags for mips arch, target or host.
|
||||
|
||||
CLANG_CONFIG_mips_EXTRA_ASFLAGS :=
|
||||
CLANG_CONFIG_mips_EXTRA_CFLAGS :=
|
||||
CLANG_CONFIG_mips_EXTRA_LDFLAGS :=
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# Clang flags for mips64 arch, target or host.
|
||||
|
||||
CLANG_CONFIG_mips64_EXTRA_ASFLAGS :=
|
||||
CLANG_CONFIG_mips64_EXTRA_CFLAGS :=
|
||||
CLANG_CONFIG_mips64_EXTRA_LDFLAGS :=
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
# Clang flags for x86 arch, target or host.
|
||||
|
||||
CLANG_CONFIG_x86_EXTRA_ASFLAGS := \
|
||||
-msse3
|
||||
CLANG_CONFIG_x86_EXTRA_CFLAGS :=
|
||||
CLANG_CONFIG_x86_EXTRA_LDFLAGS :=
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# Clang flags for x86_64 arch, target or host.
|
||||
|
||||
CLANG_CONFIG_x86_64_EXTRA_ASFLAGS :=
|
||||
CLANG_CONFIG_x86_64_EXTRA_CFLAGS :=
|
||||
CLANG_CONFIG_x86_64_EXTRA_LDFLAGS :=
|
||||
|
|
@ -17,18 +17,7 @@
|
|||
# Settings to use MinGW as a cross-compiler under Linux
|
||||
# Included by combo/select.make
|
||||
|
||||
$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include
|
||||
$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/lib/gcc/x86_64-w64-mingw32/4.8.3/include
|
||||
|
||||
define $(combo_var_prefix)transform-shared-lib-to-toc
|
||||
$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OBJDUMP) -x $(1) | grep "^Name" | cut -f3 -d" " > $(2)
|
||||
$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)NM) -g -f p $(1) | cut -f1-2 -d" " >> $(2)
|
||||
endef
|
||||
|
||||
$(combo_var_prefix)SHLIB_SUFFIX := .dll
|
||||
$(combo_var_prefix)EXECUTABLE_SUFFIX := .exe
|
||||
|
||||
$(combo_var_prefix)IS_64_BIT :=
|
||||
|
||||
# The mingw gcc is 4.8, 4.9 is required for color diagnostics
|
||||
$(combo_var_prefix)UNKNOWN_CFLAGS := -fdiagnostics-color
|
||||
|
|
|
|||
|
|
@ -17,18 +17,7 @@
|
|||
# Settings to use MinGW as a cross-compiler under Linux
|
||||
# Included by combo/select.make
|
||||
|
||||
$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include
|
||||
$(combo_var_prefix)C_INCLUDES += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/lib/gcc/x86_64-w64-mingw32/4.8.3/include
|
||||
|
||||
define $(combo_var_prefix)transform-shared-lib-to-toc
|
||||
$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)OBJDUMP) -x $(1) | grep "^Name" | cut -f3 -d" " > $(2)
|
||||
$(hide) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)NM) -g -f p $(1) | cut -f1-2 -d" " >> $(2)
|
||||
endef
|
||||
|
||||
$(combo_var_prefix)SHLIB_SUFFIX := .dll
|
||||
$(combo_var_prefix)EXECUTABLE_SUFFIX := .exe
|
||||
|
||||
$(combo_var_prefix)IS_64_BIT := true
|
||||
|
||||
# The mingw gcc is 4.8, 4.9 is required for color diagnostics
|
||||
$(combo_var_prefix)UNKNOWN_CFLAGS := -fdiagnostics-color
|
||||
|
|
|
|||
|
|
@ -17,21 +17,12 @@
|
|||
# Configuration for Darwin (Mac OS X) on x86.
|
||||
# Included by combo/select.mk
|
||||
|
||||
include $(BUILD_COMBOS)/mac_version.mk
|
||||
|
||||
define $(combo_var_prefix)transform-shared-lib-to-toc
|
||||
$(call _gen_toc_command_for_macho,$(1),$(2))
|
||||
endef
|
||||
|
||||
$(combo_2nd_arch_prefix)HOST_SHLIB_SUFFIX := .dylib
|
||||
$(combo_2nd_arch_prefix)HOST_JNILIB_SUFFIX := .jnilib
|
||||
|
||||
$(combo_2nd_arch_prefix)HOST_GLOBAL_ARFLAGS := cqs
|
||||
|
||||
# Use Darwin's libc++, as Darwin's libstdc++ is old and does not support C++11
|
||||
$(combo_2nd_arch_prefix)HOST_SYSTEMCPP_CPPFLAGS := -isystem $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1
|
||||
$(combo_2nd_arch_prefix)HOST_SYSTEMCPP_LDFLAGS := -stdlib=libc++
|
||||
|
||||
############################################################
|
||||
## Macros after this line are shared by the 64-bit config.
|
||||
|
||||
|
|
|
|||
|
|
@ -17,21 +17,12 @@
|
|||
# Configuration for Darwin (Mac OS X) on x86_64.
|
||||
# Included by combo/select.mk
|
||||
|
||||
include $(BUILD_COMBOS)/mac_version.mk
|
||||
|
||||
define $(combo_var_prefix)transform-shared-lib-to-toc
|
||||
$(call _gen_toc_command_for_macho,$(1),$(2))
|
||||
endef
|
||||
|
||||
HOST_SHLIB_SUFFIX := .dylib
|
||||
HOST_JNILIB_SUFFIX := .jnilib
|
||||
|
||||
HOST_GLOBAL_ARFLAGS := cqs
|
||||
|
||||
# Use Darwin's libc++, as Darwin's libstdc++ is old and does not support C++11
|
||||
HOST_SYSTEMCPP_CPPFLAGS := -isystem $(mac_sdk_path)/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1
|
||||
HOST_SYSTEMCPP_LDFLAGS := -stdlib=libc++
|
||||
|
||||
# We Reuse the following functions with the same name from HOST_darwin-x86.mk:
|
||||
# transform-host-o-to-shared-lib-inner
|
||||
# transform-host-o-to-executable-inner
|
||||
|
|
|
|||
|
|
@ -21,9 +21,6 @@ define $(combo_var_prefix)transform-shared-lib-to-toc
|
|||
$(call _gen_toc_command_for_elf,$(1),$(2))
|
||||
endef
|
||||
|
||||
# gcc location for clang; to be updated when clang is updated
|
||||
$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8
|
||||
|
||||
############################################################
|
||||
## Macros after this line are shared by the 64-bit config.
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,3 @@
|
|||
define $(combo_var_prefix)transform-shared-lib-to-toc
|
||||
$(call _gen_toc_command_for_elf,$(1),$(2))
|
||||
endef
|
||||
|
||||
# gcc location for clang; to be updated when clang is updated
|
||||
HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8
|
||||
|
|
|
|||
|
|
@ -33,11 +33,6 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),)
|
|||
TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te
|
||||
endif
|
||||
|
||||
# Decouple NDK library selection with platform compiler version
|
||||
$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9
|
||||
|
||||
TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT).mk
|
||||
ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
|
||||
$(error Unknown ARM architecture version: $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT))
|
||||
|
|
@ -46,65 +41,10 @@ endif
|
|||
include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
|
||||
include $(BUILD_SYSTEM)/combo/fdo.mk
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/arm/arm-linux-androideabi-$($(combo_2nd_arch_prefix)TARGET_GCC_VERSION)
|
||||
|
||||
define $(combo_var_prefix)transform-shared-lib-to-toc
|
||||
$(call _gen_toc_command_for_elf,$(1),$(2))
|
||||
endef
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_arm_CFLAGS := -O2 \
|
||||
-fomit-frame-pointer \
|
||||
-fstrict-aliasing \
|
||||
-funswitch-loops
|
||||
|
||||
# Modules can choose to compile some source as thumb.
|
||||
$(combo_2nd_arch_prefix)TARGET_thumb_CFLAGS := -mthumb \
|
||||
-Os \
|
||||
-fomit-frame-pointer \
|
||||
-fno-strict-aliasing
|
||||
|
||||
# Set FORCE_ARM_DEBUGGING to "true" in your buildspec.mk
|
||||
# or in your environment to force a full arm build, even for
|
||||
# files that are normally built as thumb; this can make
|
||||
# gdb debugging easier. Don't forget to do a clean build.
|
||||
#
|
||||
# NOTE: if you try to build a -O0 build with thumb, several
|
||||
# of the libraries (libpv, libwebcore, libkjs) need to be built
|
||||
# with -mlong-calls. When built at -O0, those libraries are
|
||||
# too big for a thumb "BL <label>" to go from one end to the other.
|
||||
ifeq ($(FORCE_ARM_DEBUGGING),true)
|
||||
$(combo_2nd_arch_prefix)TARGET_arm_CFLAGS += -fno-omit-frame-pointer -fno-strict-aliasing
|
||||
$(combo_2nd_arch_prefix)TARGET_thumb_CFLAGS += -marm -fno-omit-frame-pointer
|
||||
endif
|
||||
|
||||
# More flags/options can be added here
|
||||
$(combo_2nd_arch_prefix)TARGET_RELEASE_CFLAGS := \
|
||||
-DNDEBUG \
|
||||
-g \
|
||||
-Wstrict-aliasing=2 \
|
||||
-fgcse-after-reload \
|
||||
-frerun-cse-after-loop \
|
||||
-frename-registers
|
||||
|
||||
libc_root := bionic/libc
|
||||
|
||||
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
|
||||
KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
|
||||
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_$(combo_2nd_arch_prefix)ARCH)
|
||||
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \
|
||||
$(libc_root)/arch-arm/include \
|
||||
$(libc_root)/include \
|
||||
$(KERNEL_HEADERS)
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_STATIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_DYNAMIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTEND_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_SO_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTEND_SO_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_PACK_MODULE_RELOCATIONS := true
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker
|
||||
|
|
|
|||
|
|
@ -33,11 +33,6 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
|
|||
TARGET_ARCH_VARIANT := armv8
|
||||
endif
|
||||
|
||||
# Decouple NDK library selection with platform compiler version
|
||||
TARGET_NDK_GCC_VERSION := 4.9
|
||||
|
||||
TARGET_GCC_VERSION := 4.9
|
||||
|
||||
TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk
|
||||
ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
|
||||
$(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT))
|
||||
|
|
@ -46,40 +41,10 @@ endif
|
|||
include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
|
||||
include $(BUILD_SYSTEM)/combo/fdo.mk
|
||||
|
||||
TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/aarch64/aarch64-linux-android-$(TARGET_GCC_VERSION)
|
||||
|
||||
define $(combo_var_prefix)transform-shared-lib-to-toc
|
||||
$(call _gen_toc_command_for_elf,$(1),$(2))
|
||||
endef
|
||||
|
||||
# More flags/options can be added here
|
||||
TARGET_RELEASE_CFLAGS := \
|
||||
-DNDEBUG \
|
||||
-O2 -g \
|
||||
-Wstrict-aliasing=2 \
|
||||
-fgcse-after-reload \
|
||||
-frerun-cse-after-loop \
|
||||
-frename-registers
|
||||
|
||||
libc_root := bionic/libc
|
||||
|
||||
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
|
||||
KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
|
||||
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH)
|
||||
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
|
||||
|
||||
TARGET_C_INCLUDES := \
|
||||
$(libc_root)/arch-arm64/include \
|
||||
$(libc_root)/include \
|
||||
$(KERNEL_HEADERS)
|
||||
|
||||
TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
|
||||
TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
|
||||
TARGET_CRTEND_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
|
||||
|
||||
TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
|
||||
TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
|
||||
|
||||
TARGET_PACK_MODULE_RELOCATIONS := true
|
||||
|
||||
TARGET_LINKER := /system/bin/linker64
|
||||
|
|
|
|||
|
|
@ -33,11 +33,6 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),)
|
|||
TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := mips32r2-fp
|
||||
endif
|
||||
|
||||
# Decouple NDK library selection with platform compiler version
|
||||
$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9
|
||||
|
||||
TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT).mk
|
||||
ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
|
||||
$(error Unknown MIPS architecture variant: $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT))
|
||||
|
|
@ -46,52 +41,10 @@ endif
|
|||
include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
|
||||
include $(BUILD_SYSTEM)/combo/fdo.mk
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mips64el-linux-android-$($(combo_2nd_arch_prefix)TARGET_GCC_VERSION)
|
||||
|
||||
define $(combo_var_prefix)transform-shared-lib-to-toc
|
||||
$(call _gen_toc_command_for_elf,$(1),$(2))
|
||||
endef
|
||||
|
||||
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
|
||||
|
||||
# More flags/options can be added here
|
||||
$(combo_2nd_arch_prefix)TARGET_RELEASE_CFLAGS := \
|
||||
-DNDEBUG \
|
||||
-g \
|
||||
-Wstrict-aliasing=2 \
|
||||
-fgcse-after-reload \
|
||||
-frerun-cse-after-loop \
|
||||
-frename-registers
|
||||
|
||||
libc_root := bionic/libc
|
||||
|
||||
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
|
||||
KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
|
||||
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-mips # mips covers both mips and mips64.
|
||||
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \
|
||||
$(libc_root)/arch-mips/include \
|
||||
$(libc_root)/include \
|
||||
$(KERNEL_HEADERS)
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_STATIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_DYNAMIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTEND_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_SO_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTEND_SO_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_PACK_MODULE_RELOCATIONS := true
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker
|
||||
|
|
|
|||
|
|
@ -33,11 +33,6 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
|
|||
TARGET_ARCH_VARIANT := mips64r6
|
||||
endif
|
||||
|
||||
# Decouple NDK library selection with platform compiler version
|
||||
TARGET_NDK_GCC_VERSION := 4.9
|
||||
|
||||
TARGET_GCC_VERSION := 4.9
|
||||
|
||||
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))
|
||||
|
|
@ -46,53 +41,10 @@ endif
|
|||
include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
|
||||
include $(BUILD_SYSTEM)/combo/fdo.mk
|
||||
|
||||
TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mips64el-linux-android-$(TARGET_GCC_VERSION)
|
||||
|
||||
define $(combo_var_prefix)transform-shared-lib-to-toc
|
||||
$(call _gen_toc_command_for_elf,$(1),$(2))
|
||||
endef
|
||||
|
||||
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
|
||||
|
||||
# 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
|
||||
|
||||
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
|
||||
KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
|
||||
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-mips
|
||||
# TODO: perhaps use $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) instead of asm-mips ?
|
||||
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
|
||||
|
||||
TARGET_C_INCLUDES := \
|
||||
$(libc_root)/arch-mips64/include \
|
||||
$(libc_root)/include \
|
||||
$(KERNEL_HEADERS)
|
||||
|
||||
TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
|
||||
TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
|
||||
TARGET_CRTEND_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
|
||||
|
||||
TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
|
||||
TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
|
||||
|
||||
TARGET_PACK_MODULE_RELOCATIONS := true
|
||||
|
||||
TARGET_LINKER := /system/bin/linker64
|
||||
|
|
|
|||
|
|
@ -22,11 +22,6 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),)
|
|||
TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := x86
|
||||
endif
|
||||
|
||||
# Decouple NDK library selection with platform compiler version
|
||||
$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9
|
||||
|
||||
# Include the arch-variant-specific configuration file.
|
||||
# Its role is to define various ARCH_X86_HAVE_XXX feature macros,
|
||||
# plus initial values for TARGET_GLOBAL_CFLAGS
|
||||
|
|
@ -39,31 +34,10 @@ endif
|
|||
include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
|
||||
include $(BUILD_SYSTEM)/combo/fdo.mk
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$($(combo_2nd_arch_prefix)TARGET_GCC_VERSION)
|
||||
|
||||
define $(combo_var_prefix)transform-shared-lib-to-toc
|
||||
$(call _gen_toc_command_for_elf,$(1),$(2))
|
||||
endef
|
||||
|
||||
libc_root := bionic/libc
|
||||
|
||||
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
|
||||
KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
|
||||
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64.
|
||||
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \
|
||||
$(libc_root)/arch-x86/include \
|
||||
$(libc_root)/include \
|
||||
$(KERNEL_HEADERS)
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_STATIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_DYNAMIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTEND_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_SO_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
|
||||
$(combo_2nd_arch_prefix)TARGET_CRTEND_SO_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_PACK_MODULE_RELOCATIONS := true
|
||||
|
||||
$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker
|
||||
|
|
|
|||
|
|
@ -22,11 +22,6 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
|
|||
TARGET_ARCH_VARIANT := x86_64
|
||||
endif
|
||||
|
||||
# Decouple NDK library selection with platform compiler version
|
||||
TARGET_NDK_GCC_VERSION := 4.9
|
||||
|
||||
TARGET_GCC_VERSION := 4.9
|
||||
|
||||
# Include the arch-variant-specific configuration file.
|
||||
# Its role is to define various ARCH_X86_HAVE_XXX feature macros,
|
||||
# plus initial values for TARGET_GLOBAL_CFLAGS
|
||||
|
|
@ -39,31 +34,10 @@ endif
|
|||
include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
|
||||
include $(BUILD_SYSTEM)/combo/fdo.mk
|
||||
|
||||
TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$(TARGET_GCC_VERSION)
|
||||
|
||||
define $(combo_var_prefix)transform-shared-lib-to-toc
|
||||
$(call _gen_toc_command_for_elf,$(1),$(2))
|
||||
endef
|
||||
|
||||
libc_root := bionic/libc
|
||||
|
||||
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
|
||||
KERNEL_HEADERS_COMMON += $(libc_root)/kernel/common
|
||||
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64.
|
||||
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
|
||||
|
||||
TARGET_C_INCLUDES := \
|
||||
$(libc_root)/arch-x86_64/include \
|
||||
$(libc_root)/include \
|
||||
$(KERNEL_HEADERS)
|
||||
|
||||
TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
|
||||
TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
|
||||
TARGET_CRTEND_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
|
||||
|
||||
TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
|
||||
TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
|
||||
|
||||
TARGET_LINKER := /system/bin/linker64
|
||||
|
||||
TARGET_GLOBAL_YASM_FLAGS := -f elf64 -m amd64
|
||||
|
|
|
|||
|
|
@ -2,14 +2,3 @@
|
|||
# Generating binaries for the ARMv5TE architecture and higher
|
||||
#
|
||||
|
||||
# Note: Hard coding the 'tune' value here is probably not ideal,
|
||||
# and a better solution should be found in the future.
|
||||
#
|
||||
arch_variant_cflags := \
|
||||
-march=armv5te \
|
||||
-mtune=xscale \
|
||||
-D__ARM_ARCH_5__ \
|
||||
-D__ARM_ARCH_5T__ \
|
||||
-D__ARM_ARCH_5E__ \
|
||||
-D__ARM_ARCH_5TE__
|
||||
|
||||
|
|
|
|||
|
|
@ -5,56 +5,3 @@ ARCH_ARM_HAVE_ARMV7A := true
|
|||
ARCH_ARM_HAVE_VFP := true
|
||||
ARCH_ARM_HAVE_VFP_D32 := true
|
||||
ARCH_ARM_HAVE_NEON := true
|
||||
|
||||
local_arch_has_lpae := false
|
||||
|
||||
ifneq (,$(filter cortex-a15 krait denver,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
|
||||
# TODO: krait is not a cortex-a15, we set the variant to cortex-a15 so that
|
||||
# hardware divide operations are generated. This should be removed and a
|
||||
# krait CPU variant added to GCC. For clang we specify -mcpu for krait in
|
||||
# core/clang/arm.mk.
|
||||
arch_variant_cflags := -mcpu=cortex-a15
|
||||
|
||||
local_arch_has_lpae := true
|
||||
arch_variant_ldflags := \
|
||||
-Wl,--no-fix-cortex-a8
|
||||
else
|
||||
ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a8)
|
||||
arch_variant_cflags := -mcpu=cortex-a8
|
||||
arch_variant_ldflags := \
|
||||
-Wl,--fix-cortex-a8
|
||||
else
|
||||
ifneq (,$(filter cortex-a7 cortex-a53 cortex-a53.a57,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
|
||||
arch_variant_cflags := -mcpu=cortex-a7
|
||||
|
||||
local_arch_has_lpae := true
|
||||
arch_variant_ldflags := \
|
||||
-Wl,--no-fix-cortex-a8
|
||||
else
|
||||
ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),cortex-a9)
|
||||
arch_variant_cflags := -march=armv7-a
|
||||
arch_variant_ldflags := \
|
||||
-Wl,--no-fix-cortex-a8
|
||||
else
|
||||
arch_variant_cflags := -march=armv7-a
|
||||
# Generic ARM might be a Cortex A8 -- better safe than sorry
|
||||
arch_variant_ldflags := \
|
||||
-Wl,--fix-cortex-a8
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq (true,$(local_arch_has_lpae))
|
||||
# Fake an ARM compiler flag as these processors support LPAE which GCC/clang
|
||||
# don't advertise.
|
||||
# TODO This is a hack and we need to add it for each processor that supports LPAE until some
|
||||
# better solution comes around. See Bug 27340895
|
||||
arch_variant_cflags += -D__ARM_FEATURE_LPAE=1
|
||||
endif
|
||||
|
||||
local_arch_has_lpae :=
|
||||
|
||||
arch_variant_cflags += \
|
||||
-mfloat-abi=softfp \
|
||||
-mfpu=neon
|
||||
|
|
|
|||
|
|
@ -3,14 +3,3 @@
|
|||
#
|
||||
ARCH_ARM_HAVE_ARMV7A := true
|
||||
ARCH_ARM_HAVE_VFP := true
|
||||
|
||||
# Note: Hard coding the 'tune' value here is probably not ideal,
|
||||
# and a better solution should be found in the future.
|
||||
#
|
||||
arch_variant_cflags := \
|
||||
-march=armv7-a \
|
||||
-mfloat-abi=softfp \
|
||||
-mfpu=vfpv3-d16
|
||||
|
||||
arch_variant_ldflags := \
|
||||
-Wl,--fix-cortex-a8
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
ifneq (,$(filter cortex-a53,$(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
|
||||
arch_variant_cflags := -mcpu=cortex-a53
|
||||
else
|
||||
arch_variant_cflags :=
|
||||
endif
|
||||
|
|
@ -3,11 +3,3 @@
|
|||
|
||||
ARCH_MIPS_HAS_FPU :=true
|
||||
ARCH_HAVE_ALIGNED_DOUBLES :=true
|
||||
arch_variant_cflags := \
|
||||
-mips32 \
|
||||
-mfp32 \
|
||||
-modd-spreg \
|
||||
-mno-synci
|
||||
|
||||
arch_variant_ldflags := \
|
||||
-Wl,-melf32ltsmip
|
||||
|
|
|
|||
|
|
@ -4,13 +4,3 @@
|
|||
|
||||
ARCH_MIPS_HAS_FPU :=true
|
||||
ARCH_HAVE_ALIGNED_DOUBLES :=true
|
||||
arch_variant_cflags := \
|
||||
-mips32r2 \
|
||||
-mfp32 \
|
||||
-modd-spreg \
|
||||
-mno-fused-madd \
|
||||
-Wa,-mmxu \
|
||||
-mno-synci
|
||||
|
||||
arch_variant_ldflags := \
|
||||
-Wl,-melf32ltsmip
|
||||
|
|
|
|||
|
|
@ -3,11 +3,3 @@
|
|||
|
||||
ARCH_MIPS_HAS_FPU :=true
|
||||
ARCH_HAVE_ALIGNED_DOUBLES :=true
|
||||
arch_variant_cflags := \
|
||||
-mips32r2 \
|
||||
-mfp32 \
|
||||
-modd-spreg \
|
||||
-msynci
|
||||
|
||||
arch_variant_ldflags := \
|
||||
-Wl,-melf32ltsmip
|
||||
|
|
|
|||
|
|
@ -5,12 +5,3 @@ ARCH_MIPS_HAS_DSP :=true
|
|||
ARCH_MIPS_DSP_REV :=1
|
||||
ARCH_MIPS_HAS_FPU :=true
|
||||
ARCH_HAVE_ALIGNED_DOUBLES :=true
|
||||
arch_variant_cflags := \
|
||||
-mips32r2 \
|
||||
-mfp32 \
|
||||
-modd-spreg \
|
||||
-mdsp \
|
||||
-msynci
|
||||
|
||||
arch_variant_ldflags := \
|
||||
-Wl,-melf32ltsmip
|
||||
|
|
|
|||
|
|
@ -5,12 +5,3 @@ ARCH_MIPS_HAS_DSP :=true
|
|||
ARCH_MIPS_DSP_REV :=2
|
||||
ARCH_MIPS_HAS_FPU :=true
|
||||
ARCH_HAVE_ALIGNED_DOUBLES :=true
|
||||
arch_variant_cflags := \
|
||||
-mips32r2 \
|
||||
-mfp32 \
|
||||
-modd-spreg \
|
||||
-mdspr2 \
|
||||
-msynci
|
||||
|
||||
arch_variant_ldflags := \
|
||||
-Wl,-melf32ltsmip
|
||||
|
|
|
|||
|
|
@ -2,11 +2,3 @@
|
|||
# Generating binaries for MIPS32R6/hard-float/little-endian
|
||||
|
||||
ARCH_MIPS_REV6 := true
|
||||
arch_variant_cflags := \
|
||||
-mips32r6 \
|
||||
-mfp64 \
|
||||
-mno-odd-spreg \
|
||||
-msynci
|
||||
|
||||
arch_variant_ldflags := \
|
||||
-Wl,-melf32ltsmip
|
||||
|
|
|
|||
|
|
@ -4,7 +4,3 @@
|
|||
|
||||
ARCH_MIPS_HAS_FPU :=true
|
||||
ARCH_HAVE_ALIGNED_DOUBLES :=true
|
||||
arch_variant_cflags := \
|
||||
-mips64r2 \
|
||||
-msynci
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,3 @@
|
|||
# Configuration for Android on mips64r6.
|
||||
|
||||
ARCH_MIPS_REV6 := true
|
||||
arch_variant_cflags := \
|
||||
-mips64r6 \
|
||||
-msynci
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,3 @@
|
|||
ARCH_X86_HAVE_SSSE3 := true
|
||||
ARCH_X86_HAVE_MOVBE := true
|
||||
ARCH_X86_HAVE_POPCNT := false # popcnt is not supported by current Atom CPUs
|
||||
|
||||
# CFLAGS for this arch
|
||||
arch_variant_cflags := \
|
||||
-march=atom \
|
||||
-mfpmath=sse \
|
||||
|
||||
|
|
|
|||
|
|
@ -9,9 +9,3 @@ ARCH_X86_HAVE_AES_NI := true
|
|||
ARCH_X86_HAVE_AVX := true
|
||||
ARCH_X86_HAVE_POPCNT := true
|
||||
ARCH_X86_HAVE_MOVBE := true
|
||||
|
||||
# CFLAGS for this arch
|
||||
arch_variant_cflags := \
|
||||
-march=core-avx2 \
|
||||
-mfpmath=sse \
|
||||
|
||||
|
|
|
|||
|
|
@ -9,9 +9,3 @@ ARCH_X86_HAVE_AES_NI := true
|
|||
ARCH_X86_HAVE_AVX := true
|
||||
ARCH_X86_HAVE_POPCNT := true
|
||||
ARCH_X86_HAVE_MOVBE := false
|
||||
|
||||
# CFLAGS for this arch
|
||||
arch_variant_cflags := \
|
||||
-march=core-avx-i \
|
||||
-mfpmath=sse \
|
||||
|
||||
|
|
|
|||
|
|
@ -9,9 +9,3 @@ ARCH_X86_HAVE_AES_NI := false
|
|||
ARCH_X86_HAVE_AVX := false
|
||||
ARCH_X86_HAVE_POPCNT := true
|
||||
ARCH_X86_HAVE_MOVBE := false
|
||||
|
||||
# CFLAGS for this arch
|
||||
arch_variant_cflags := \
|
||||
-march=corei7 \
|
||||
-mfpmath=sse \
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,3 @@ ARCH_X86_HAVE_SSE4_2 := true
|
|||
ARCH_X86_HAVE_AES_NI := true
|
||||
ARCH_X86_HAVE_POPCNT := true
|
||||
ARCH_X86_HAVE_MOVBE := true
|
||||
|
||||
# CFLAGS for this arch
|
||||
arch_variant_cflags := \
|
||||
-march=slm \
|
||||
-mfpmath=sse \
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,3 @@
|
|||
ARCH_X86_HAVE_SSSE3 := false
|
||||
ARCH_X86_HAVE_MOVBE := false
|
||||
ARCH_X86_HAVE_POPCNT := false
|
||||
|
||||
|
||||
# Some intrinsic functions used by libcxx only exist for prescott or newer CPUs.
|
||||
arch_variant_cflags := \
|
||||
-march=prescott \
|
||||
|
||||
|
|
|
|||
|
|
@ -10,9 +10,3 @@ ARCH_X86_HAVE_POPCNT := true
|
|||
ARCH_X86_HAVE_SSE4 := true
|
||||
ARCH_X86_HAVE_SSE4_1 := true
|
||||
ARCH_X86_HAVE_SSE4_2 := true
|
||||
|
||||
|
||||
# Some intrinsic functions used by libcxx only exist for prescott or newer CPUs.
|
||||
arch_variant_cflags := \
|
||||
-march=prescott \
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,3 @@ ARCH_X86_HAVE_AES_NI := true
|
|||
ARCH_X86_HAVE_AVX := true
|
||||
ARCH_X86_HAVE_POPCNT := true
|
||||
ARCH_X86_HAVE_MOVBE := true
|
||||
|
||||
# CFLAGS for this arch
|
||||
arch_variant_cflags := \
|
||||
-march=core-avx2
|
||||
|
|
|
|||
|
|
@ -9,7 +9,3 @@ ARCH_X86_HAVE_AES_NI := true
|
|||
ARCH_X86_HAVE_AVX := true
|
||||
ARCH_X86_HAVE_POPCNT := true
|
||||
ARCH_X86_HAVE_MOVBE := false
|
||||
|
||||
# CFLAGS for this arch
|
||||
arch_variant_cflags := \
|
||||
-march=core-avx-i
|
||||
|
|
|
|||
|
|
@ -9,7 +9,3 @@ ARCH_X86_HAVE_AES_NI := false
|
|||
ARCH_X86_HAVE_AVX := false
|
||||
ARCH_X86_HAVE_POPCNT := true
|
||||
ARCH_X86_HAVE_MOVBE := false
|
||||
|
||||
# CFLAGS for this arch
|
||||
arch_variant_cflags := \
|
||||
-march=corei7
|
||||
|
|
|
|||
|
|
@ -11,7 +11,3 @@ ARCH_X86_HAVE_SSE4_2 := true
|
|||
ARCH_X86_HAVE_AES_NI := true
|
||||
ARCH_X86_HAVE_POPCNT := true
|
||||
ARCH_X86_HAVE_MOVBE := true
|
||||
|
||||
# CFLAGS for this arch
|
||||
arch_variant_cflags := \
|
||||
-march=slm \
|
||||
|
|
|
|||
|
|
@ -11,8 +11,3 @@ ARCH_X86_HAVE_POPCNT := true
|
|||
ARCH_X86_HAVE_SSE4 := true
|
||||
ARCH_X86_HAVE_SSE4_1 := true
|
||||
ARCH_X86_HAVE_SSE4_2 := true
|
||||
|
||||
|
||||
# CFLAGS for this arch
|
||||
arch_variant_cflags := \
|
||||
-march=x86-64
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
# Detect Mac OS X and SDK versions.
|
||||
# Output variables:
|
||||
# build_mac_version
|
||||
# mac_sdk_version
|
||||
# mac_sdk_root
|
||||
# gcc_darwin_version
|
||||
|
||||
# You can no longer install older SDKs in newer xcode versions, so it appears
|
||||
# to be expected to use the newer SDKs, but set command line flags in order to
|
||||
# target older Mac OS X versions.
|
||||
#
|
||||
# We'll use the oldest SDK we can find, and then use the -mmacosx-version-min
|
||||
# and MACOSX_DEPLOYMENT_TARGET flags to set our minimum version.
|
||||
|
||||
ifndef build_mac_version
|
||||
|
||||
build_mac_version := $(shell sw_vers -productVersion)
|
||||
|
||||
mac_sdk_versions_supported := 10.8 10.9 10.10 10.11
|
||||
ifneq ($(strip $(MAC_SDK_VERSION)),)
|
||||
mac_sdk_version := $(MAC_SDK_VERSION)
|
||||
ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),)
|
||||
$(warning ****************************************************************)
|
||||
$(warning * MAC_SDK_VERSION $(MAC_SDK_VERSION) isn't one of the supported $(mac_sdk_versions_supported))
|
||||
$(warning ****************************************************************)
|
||||
$(error Stop.)
|
||||
endif
|
||||
else
|
||||
mac_sdk_versions_installed := $(shell xcodebuild -showsdks | grep macosx | sed -e "s/.*macosx//g")
|
||||
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed), $(mac_sdk_versions_supported)))
|
||||
ifeq ($(mac_sdk_version),)
|
||||
mac_sdk_version := $(firstword $(mac_sdk_versions_supported))
|
||||
$(warning none of the installed SDKs ($mac_sdk_versions_installed) match supported versions ($(mac_sdk_versions_supported)), trying $(mac_sdk_version))
|
||||
endif
|
||||
endif
|
||||
|
||||
mac_sdk_path := $(shell xcode-select -print-path)
|
||||
# try /Applications/Xcode*.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.?.sdk
|
||||
# or /Volume/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.?.sdk
|
||||
mac_sdk_root := $(mac_sdk_path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(mac_sdk_version).sdk
|
||||
ifeq ($(wildcard $(mac_sdk_root)),)
|
||||
$(warning *****************************************************)
|
||||
$(warning * Can not find SDK $(mac_sdk_version) at $(mac_sdk_root))
|
||||
$(warning *****************************************************)
|
||||
$(error Stop.)
|
||||
endif
|
||||
|
||||
# Set to the minimum version of OS X that we want to run on.
|
||||
mac_sdk_version := $(firstword $(mac_sdk_versions_supported))
|
||||
|
||||
endif # ifndef build_mac_version
|
||||
|
|
@ -28,13 +28,8 @@ combo_var_prefix := $(combo_2nd_arch_prefix)$(combo_target)
|
|||
|
||||
# Set reasonable defaults for the various variables
|
||||
|
||||
$(combo_var_prefix)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing
|
||||
$(combo_var_prefix)GLOBAL_ARFLAGS := crsPD
|
||||
$(combo_var_prefix)GLOBAL_LD_DIRS :=
|
||||
|
||||
$(combo_var_prefix)EXECUTABLE_SUFFIX :=
|
||||
$(combo_var_prefix)SHLIB_SUFFIX := .so
|
||||
$(combo_var_prefix)JNILIB_SUFFIX := $($(combo_var_prefix)SHLIB_SUFFIX)
|
||||
$(combo_var_prefix)STATIC_LIB_SUFFIX := .a
|
||||
|
||||
# Now include the combo for this specific target.
|
||||
|
|
|
|||
|
|
@ -335,6 +335,12 @@ TARGET_CPU_ABI_LIST := $(subst $(space),$(comma),$(strip $(TARGET_CPU_ABI_LIST))
|
|||
TARGET_CPU_ABI_LIST_32_BIT := $(subst $(space),$(comma),$(strip $(TARGET_CPU_ABI_LIST_32_BIT)))
|
||||
TARGET_CPU_ABI_LIST_64_BIT := $(subst $(space),$(comma),$(strip $(TARGET_CPU_ABI_LIST_64_BIT)))
|
||||
|
||||
# GCC version selection
|
||||
TARGET_GCC_VERSION := 4.9
|
||||
ifdef TARGET_2ND_ARCH
|
||||
2ND_TARGET_GCC_VERSION := 4.9
|
||||
endif
|
||||
|
||||
# Normalize WITH_STATIC_ANALYZER and WITH_SYNTAX_CHECK
|
||||
ifeq ($(strip $(WITH_STATIC_ANALYZER)),0)
|
||||
WITH_STATIC_ANALYZER :=
|
||||
|
|
@ -652,27 +658,6 @@ endif
|
|||
# Set up final options.
|
||||
# ###############################################################
|
||||
|
||||
ifneq ($(COMMON_GLOBAL_CFLAGS)$(COMMON_GLOBAL_CPPFLAGS),)
|
||||
$(warning COMMON_GLOBAL_C(PP)FLAGS changed)
|
||||
$(info *** Device configurations are no longer allowed to change the global flags.)
|
||||
$(info *** COMMON_GLOBAL_CFLAGS: $(COMMON_GLOBAL_CFLAGS))
|
||||
$(info *** COMMON_GLOBAL_CPPFLAGS: $(COMMON_GLOBAL_CPPFLAGS))
|
||||
$(error bailing...)
|
||||
endif
|
||||
|
||||
# These can be changed to modify both host and device modules.
|
||||
COMMON_GLOBAL_CFLAGS:= -DANDROID -fmessage-length=0 -W -Wall -Wno-unused -Winit-self -Wpointer-arith
|
||||
COMMON_RELEASE_CFLAGS:= -DNDEBUG -UDEBUG
|
||||
|
||||
# Force gcc to always output color diagnostics. Ninja will strip the ANSI
|
||||
# color codes if it is not running in a terminal.
|
||||
ifdef BUILDING_WITH_NINJA
|
||||
COMMON_GLOBAL_CFLAGS += -fdiagnostics-color
|
||||
endif
|
||||
|
||||
COMMON_GLOBAL_CPPFLAGS:= -Wsign-promo
|
||||
COMMON_RELEASE_CPPFLAGS:=
|
||||
|
||||
GLOBAL_CFLAGS_NO_OVERRIDE := \
|
||||
-Werror=int-to-pointer-cast \
|
||||
-Werror=pointer-to-int-cast \
|
||||
|
|
@ -684,45 +669,18 @@ GLOBAL_CLANG_CFLAGS_NO_OVERRIDE := \
|
|||
|
||||
GLOBAL_CPPFLAGS_NO_OVERRIDE :=
|
||||
|
||||
# list of flags to turn specific warnings in to errors
|
||||
TARGET_ERROR_FLAGS := -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point -Werror=date-time
|
||||
|
||||
# We run gcc/clang with PWD=/proc/self/cwd to remove the $TOP
|
||||
# from the debug output. That way two builds in two different
|
||||
# directories will create the same output.
|
||||
# /proc doesn't exist on Darwin.
|
||||
ifeq ($(HOST_OS),linux)
|
||||
RELATIVE_PWD := PWD=/proc/self/cwd
|
||||
# Remove this useless prefix from the debug output.
|
||||
COMMON_GLOBAL_CFLAGS += -fdebug-prefix-map=/proc/self/cwd=
|
||||
else
|
||||
RELATIVE_PWD :=
|
||||
endif
|
||||
|
||||
# Allow the C/C++ macros __DATE__ and __TIME__ to be set to the
|
||||
# build date and time, so that a build may be repeated.
|
||||
# Write the date and time to a file so that the command line
|
||||
# doesn't change every time, which would cause ninja to rebuild
|
||||
# the files.
|
||||
$(shell mkdir -p $(OUT_DIR) && \
|
||||
$(DATE) "+%b %_d %Y" > $(OUT_DIR)/build_c_date.txt && \
|
||||
$(DATE) +%T > $(OUT_DIR)/build_c_time.txt)
|
||||
BUILD_DATETIME_C_DATE := $$(cat $(OUT_DIR)/build_c_date.txt)
|
||||
BUILD_DATETIME_C_TIME := $$(cat $(OUT_DIR)/build_c_time.txt)
|
||||
ifeq ($(OVERRIDE_C_DATE_TIME),true)
|
||||
COMMON_GLOBAL_CFLAGS += -Wno-builtin-macro-redefined -D__DATE__="\"$(BUILD_DATETIME_C_DATE)\"" -D__TIME__=\"$(BUILD_DATETIME_C_TIME)\"
|
||||
endif
|
||||
|
||||
HOST_RELEASE_CFLAGS += $(COMMON_RELEASE_CFLAGS)
|
||||
|
||||
HOST_RELEASE_CPPFLAGS += $(COMMON_RELEASE_CPPFLAGS)
|
||||
|
||||
TARGET_RELEASE_CFLAGS += $(COMMON_RELEASE_CFLAGS)
|
||||
|
||||
TARGET_RELEASE_CPPFLAGS += $(COMMON_RELEASE_CPPFLAGS)
|
||||
|
||||
HOST_GLOBAL_LD_DIRS += -L$(HOST_OUT_INTERMEDIATE_LIBRARIES)
|
||||
TARGET_GLOBAL_LD_DIRS += -L$(TARGET_OUT_INTERMEDIATE_LIBRARIES)
|
||||
HOST_GLOBAL_LD_DIRS := -L$(HOST_OUT_INTERMEDIATE_LIBRARIES)
|
||||
TARGET_GLOBAL_LD_DIRS := -L$(TARGET_OUT_INTERMEDIATE_LIBRARIES)
|
||||
|
||||
HOST_PROJECT_INCLUDES:= $(SRC_HEADERS) $(HOST_OUT_HEADERS)
|
||||
TARGET_PROJECT_INCLUDES:= $(SRC_HEADERS) $(TARGET_OUT_HEADERS) \
|
||||
|
|
@ -730,29 +688,21 @@ TARGET_PROJECT_INCLUDES:= $(SRC_HEADERS) $(TARGET_OUT_HEADERS) \
|
|||
$(TARGET_PRODUCT_KERNEL_HEADERS)
|
||||
|
||||
ifdef TARGET_2ND_ARCH
|
||||
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_RELEASE_CFLAGS += $(COMMON_RELEASE_CFLAGS)
|
||||
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_RELEASE_CPPFLAGS += $(COMMON_RELEASE_CPPFLAGS)
|
||||
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LD_DIRS += -L$($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)
|
||||
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_LD_DIRS := -L$($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)
|
||||
$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_PROJECT_INCLUDES := $(TARGET_PROJECT_INCLUDES)
|
||||
endif
|
||||
|
||||
ifdef HOST_2ND_ARCH
|
||||
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_RELEASE_CFLAGS += $(COMMON_RELEASE_CFLAGS)
|
||||
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_RELEASE_CPPFLAGS += $(COMMON_RELEASE_CPPFLAGS)
|
||||
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LD_DIRS += -L$($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES)
|
||||
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_LD_DIRS := -L$($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES)
|
||||
$(HOST_2ND_ARCH_VAR_PREFIX)HOST_PROJECT_INCLUDES := $(HOST_PROJECT_INCLUDES)
|
||||
endif
|
||||
|
||||
ifdef HOST_CROSS_OS
|
||||
HOST_CROSS_RELEASE_CFLAGS += $(COMMON_RELEASE_CFLAGS)
|
||||
HOST_CROSS_RELEASE_CPPFLAGS += $(COMMON_RELEASE_CPPFLAGS)
|
||||
HOST_CROSS_GLOBAL_LD_DIRS += -L$(HOST_CROSS_OUT_INTERMEDIATE_LIBRARIES)
|
||||
HOST_CROSS_GLOBAL_LD_DIRS := -L$(HOST_CROSS_OUT_INTERMEDIATE_LIBRARIES)
|
||||
HOST_CROSS_PROJECT_INCLUDES:= $(SRC_HEADERS) $(HOST_CROSS_OUT_HEADERS)
|
||||
|
||||
ifdef HOST_CROSS_2ND_ARCH
|
||||
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_RELEASE_CFLAGS += $(COMMON_RELEASE_CFLAGS)
|
||||
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_RELEASE_CPPFLAGS += $(COMMON_RELEASE_CPPFLAGS)
|
||||
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_GLOBAL_LD_DIRS += -L$($(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_INTERMEDIATE_LIBRARIES)
|
||||
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_GLOBAL_LD_DIRS := -L$($(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_INTERMEDIATE_LIBRARIES)
|
||||
$(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_PROJECT_INCLUDES:= $(SRC_HEADERS) $($(HOST_CROSS_2ND_ARCH_VAR_PREFIX)HOST_CROSS_OUT_HEADERS)
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ ifeq ($(HOST_OS),linux)
|
|||
HOST_CROSS_OS := windows
|
||||
HOST_CROSS_ARCH := x86
|
||||
HOST_CROSS_2ND_ARCH := x86_64
|
||||
2ND_HOST_CROSS_IS_64_BIT := true
|
||||
endif
|
||||
|
||||
ifeq ($(HOST_OS),)
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@ my_target_crtbegin_dynamic_o :=
|
|||
my_target_crtbegin_static_o :=
|
||||
my_target_crtend_o :=
|
||||
else
|
||||
my_target_crtbegin_dynamic_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_DYNAMIC_O)
|
||||
my_target_crtbegin_static_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_STATIC_O)
|
||||
my_target_crtend_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTEND_O)
|
||||
my_target_crtbegin_dynamic_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
|
||||
my_target_crtbegin_static_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
|
||||
my_target_crtend_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
|
||||
endif
|
||||
ifdef LOCAL_SDK_VERSION
|
||||
# Make sure the prebuilt NDK paths are put ahead of the TARGET_GLOBAL_LD_DIRS,
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ ifeq ($(LOCAL_NO_CRT),true)
|
|||
my_target_crtbegin_so_o :=
|
||||
my_target_crtend_so_o :=
|
||||
else
|
||||
my_target_crtbegin_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTBEGIN_SO_O)
|
||||
my_target_crtend_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CRTEND_SO_O)
|
||||
my_target_crtbegin_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
|
||||
my_target_crtend_so_o := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
|
||||
endif
|
||||
ifdef LOCAL_SDK_VERSION
|
||||
# Make sure the prebuilt NDK paths are put ahead of the TARGET_GLOBAL_LD_DIRS,
|
||||
|
|
|
|||
Loading…
Reference in a new issue