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

Commit 5de8ebc8 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 5d23800f: am 1bb9adb8: Merge "[MIPS64] Enable mips64 clang" 

* commit '5d23800f':
  [MIPS64] Enable mips64 clang
parents 8478ab00 5d23800f

core/clang/TARGET_mips.mk

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CFLAGS := \ 
  $(CLANG_CONFIG_mips_TARGET_EXTRA_CFLAGS)



$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CPPFLAGS := \

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

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

  $(CLANG_CONFIG_mips_TARGET_EXTRA_CPPFLAGS)



$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \

core/combo/TARGET_linux-mips64.mk

+0 −3
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) 
$(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT))

endif



# TODO: Enable Clang when its mips64 prebuilt is added

WITHOUT_TARGET_CLANG := true



include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

include $(BUILD_SYSTEM)/combo/fdo.mk

target/board/generic_mips64/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ TARGET_2ND_ARCH := mips 
ifeq (,$(TARGET_2ND_ARCH_VARIANT))

TARGET_2ND_ARCH_VARIANT :=  mips32r2-fp

endif

TARGET_CPU_ABI  := mips

TARGET_2ND_CPU_ABI  := mips



# The emulator (qemu) uses the Goldfish devices

HAVE_HTC_AUDIO_DRIVER := true