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

Commit d23798bf authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "[MIPSR6] Add mips64r6 and mips32r6 targets"

parents 0b3c42cb 6bab974c

core/clang/mips.mk

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ CLANG_CONFIG_mips_UNKNOWN_CFLAGS := \ 
  $(CLANG_CONFIG_UNKNOWN_CFLAGS) \

  -mips32 \

  -mips32r2 \

  -mips32r6 \

  -mfp32 \

  -mfp64 \

  -mfpxx \

core/clang/mips64.mk

+1 −2
Original line number Diff line number Diff line 
# Clang flags for mips64 arch, target or host.



$(warning Untested mips64 clang flags, fix me!)



CLANG_CONFIG_mips64_EXTRA_ASFLAGS :=

CLANG_CONFIG_mips64_EXTRA_CFLAGS :=

CLANG_CONFIG_mips64_EXTRA_LDFLAGS :=
@@ -9,6 +7,7 @@ CLANG_CONFIG_mips64_EXTRA_LDFLAGS := 
# Include common unknown flags

CLANG_CONFIG_mips64_UNKNOWN_CFLAGS := \

  $(CLANG_CONFIG_UNKNOWN_CFLAGS) \

  -mips64r6 \

  -fno-strict-volatile-bitfields \

  -fgcse-after-reload \

  -frerun-cse-after-loop \

core/combo/arch/mips/mips32r6.mk

0 → 100644
+12 −0
Original line number Diff line number Diff line 
# Configuration for Android on MIPS.

# 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

core/combo/arch/mips64/mips64r6.mk

0 → 100644
+7 −0
Original line number Diff line number Diff line 
# Configuration for Android on mips64r6.



ARCH_MIPS_REV6 := true

arch_variant_cflags := \

    -mips64r6 \

    -msynci

target/board/generic_mips64/BoardConfig.mk

+4 −0
Original line number Diff line number Diff line
@@ -30,8 +30,12 @@ TARGET_CPU_ABI := mips64 


TARGET_2ND_ARCH := mips

ifeq (,$(TARGET_2ND_ARCH_VARIANT))

ifeq ($(TARGET_ARCH_VARIANT),mips64r6)

TARGET_2ND_ARCH_VARIANT :=  mips32r6

else

TARGET_2ND_ARCH_VARIANT :=  mips32r2-fp

endif

endif

TARGET_2ND_CPU_ABI  := mips



# The emulator (qemu) uses the Goldfish devices