Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed68f54b authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge changes I769ed278,I99cb69ea,I57bcbed0,I6e51e51f,Iab2d36e2 into nyc-dev 

* changes:
  Remove debug statement
  Tell Soong about HOST_CROSS_*
  Update to use the latest clang-2629532.
  Use newest clang static analyzers.
  Add 64-bit windows cross-compiles
parents 837d60f4 48fd6d4d

core/base_rules.mk

+4 −4
Original line number Diff line number Diff line
@@ -168,14 +168,14 @@ ifneq ($(strip $(LOCAL_BUILT_MODULE)$(LOCAL_INSTALLED_MODULE)),) 
endif



my_register_name := $(LOCAL_MODULE)

ifeq ($(my_host_cross),true)

  my_register_name := host_cross_$(LOCAL_MODULE)

endif

ifdef LOCAL_2ND_ARCH_VAR_PREFIX

ifndef LOCAL_NO_2ND_ARCH_MODULE_SUFFIX

my_register_name := $(LOCAL_MODULE)$($(my_prefix)2ND_ARCH_MODULE_SUFFIX)

my_register_name := $(my_register_name)$($(my_prefix)2ND_ARCH_MODULE_SUFFIX)

endif

endif

ifeq ($(my_host_cross),true)

  my_register_name := host_cross_$(LOCAL_MODULE)

endif

# Make sure that this IS_HOST/CLASS/MODULE combination is unique.

module_id := MODULE.$(if \

    $(LOCAL_IS_HOST_MODULE),$($(my_prefix)OS),TARGET).$(LOCAL_MODULE_CLASS).$(my_register_name)

core/binary.mk

+16 −4
Original line number Diff line number Diff line
@@ -404,6 +404,12 @@ ifeq ($(strip $(WITH_STATIC_ANALYZER)),) 
  LOCAL_NO_STATIC_ANALYZER := true

endif



# Clang does not recognize all gcc flags.

# Use static analyzer only if clang is used.

ifneq ($(my_clang),true)

  LOCAL_NO_STATIC_ANALYZER := true

endif



ifneq ($(strip $(LOCAL_IS_HOST_MODULE)),)

  my_syntax_arch := host

else
@@ -418,13 +424,16 @@ ifeq ($(strip $(my_cc)),) 
  endif

  my_cc := $(my_cc_wrapper) $(my_cc)

endif



ifneq ($(LOCAL_NO_STATIC_ANALYZER),true)

  my_cc := $(SYNTAX_TOOLS_PREFIX)/ccc-analyzer $(my_syntax_arch) "$(my_cc)"

  my_cc := CCC_CC=$(CLANG) CLANG=$(CLANG) \

           $(SYNTAX_TOOLS_PREFIX)/ccc-analyzer

else

ifneq ($(LOCAL_NO_SYNTAX_CHECK),true)

  my_cc := $(SYNTAX_TOOLS_PREFIX)/ccc-syntax $(my_syntax_arch) "$(my_cc)"

  my_cc := $(my_cc) -fsyntax-only

endif

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CC := $(my_cc)



ifeq ($(strip $(my_cxx)),)
@@ -435,13 +444,16 @@ ifeq ($(strip $(my_cxx)),) 
  endif

  my_cxx := $(my_cxx_wrapper) $(my_cxx)

endif



ifneq ($(LOCAL_NO_STATIC_ANALYZER),true)

  my_cxx := $(SYNTAX_TOOLS_PREFIX)/cxx-analyzer $(my_syntax_arch) "$(my_cxx)"

  my_cxx := CCC_CXX=$(CLANG_CXX) CLANG_CXX=$(CLANG_CXX) \

            $(SYNTAX_TOOLS_PREFIX)/c++-analyzer

else

ifneq ($(LOCAL_NO_SYNTAX_CHECK),true)

  my_cxx := $(SYNTAX_TOOLS_PREFIX)/cxx-syntax $(my_syntax_arch) "$(my_cxx)"

  my_cxx := $(my_cxx) -fsyntax-only

endif

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LINKER := $(my_linker)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CXX := $(my_cxx)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CLANG := $(my_clang)

core/clang/HOST_CROSS_windows.mk→core/clang/HOST_CROSS_x86.mk

+9 −9
Original line number Diff line number Diff line
@@ -37,20 +37,20 @@ CLANG_CONFIG_x86_HOST_CROSS_EXTRA_LDFLAGS := \ 
  $(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_LDFLAGS) \

  -target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE)



CLANG_HOST_CROSS_GLOBAL_CFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_CFLAGS)) \

$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_CFLAGS := \

  $(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CFLAGS)) \

  $(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CFLAGS)



CLANG_HOST_CROSS_GLOBAL_CONLYFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_CONLYFLAGS)) \

$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_CONLYFLAGS := \

  $(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CONLYFLAGS)) \

  $(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CONLYFLAGS)



CLANG_HOST_CROSS_GLOBAL_CPPFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_CPPFLAGS)) \

$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_CPPFLAGS := \

  $(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CPPFLAGS)) \

  $(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CPPFLAGS)



CLANG_HOST_CROSS_GLOBAL_LDFLAGS := \

  $(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_LDFLAGS)) \

$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_LDFLAGS := \

  $(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_LDFLAGS)) \

  $(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_LDFLAGS)



HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a
 
$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a

core/clang/HOST_CROSS_x86_64.mk

0 → 100644
+56 −0
Original line number Diff line number Diff line 


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) \

  -target $(CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE)



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)CLANG_HOST_CROSS_GLOBAL_CFLAGS := \

  $(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CFLAGS)) \

  $(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CFLAGS)



$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_CONLYFLAGS := \

  $(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CONLYFLAGS)) \

  $(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CONLYFLAGS)



$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_CPPFLAGS := \

  $(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CPPFLAGS)) \

  $(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CPPFLAGS)



$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_LDFLAGS := \

  $(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_LDFLAGS)) \

  $(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_LDFLAGS)



$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a

core/clang/HOST_x86_common.mk

+5 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 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

  --sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot



CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \

  --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)
@@ -23,14 +23,14 @@ 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 := \

  --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  --sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -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 \

  --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 \
@@ -38,14 +38,14 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \ 
else

CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \

  --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \

  --sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  --sysroot $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \

  -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 \

  --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 \