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

Commit a6b14661 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 1a81a0ef: Merge "[MIPS] Do not use compact branches until GDB supports them" 

* commit '1a81a0ef':
  [MIPS] Do not use compact branches until GDB supports them
parents ce78cf40 1a81a0ef

core/clang/mips.mk

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ CLANG_CONFIG_mips_UNKNOWN_CFLAGS := \ 
  -msynci \

  -mno-fused-madd



# Temporary workaround until GDB supports compact branches.

CLANG_CONFIG_mips_UNKNOWN_CFLAGS += -mcompact-branches=never



# Temporary workaround for Mips clang++ problem,  creates

#   relocated ptrs in read-only pic .gcc_exception_table;

#   permanent fix pending at http://reviews.llvm.org/D9669

core/clang/mips64.mk

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ CLANG_CONFIG_mips64_UNKNOWN_CFLAGS := \ 
  -msynci \

  -mno-fused-madd



# Temporary workaround until GDB supports compact branches.

CLANG_CONFIG_mips64_UNKNOWN_CFLAGS += -mcompact-branches=never



# Temporary workaround for Mips clang++ problem creating

#   relocated ptrs in read-only pic .gcc_exception_table;

#   permanent fix pending at http://reviews.llvm.org/D9669

core/combo/TARGET_linux-mips.mk

+9 −0
Original line number Diff line number Diff line
@@ -79,6 +79,15 @@ ifeq ($(FORCE_MIPS_DEBUGGING),true) 
  TARGET_mips_CFLAGS += -fno-omit-frame-pointer

endif



# For mips r6 (both 32bit and 64bit), GDB cannot stop on a breakpoint

# if it is set on a compact branch. Turn generation of compact

# branches off, to allow GDB to work properly.

# Note: JIC instruction is not affected by this flag.

# TODO: Remove this after GDB is fixed.

ifeq ($(TARGET_ARCH),mips64)

TARGET_mips_CFLAGS += -mcompact-branches=never

endif



android_config_h := $(call select-android-config-h,linux-mips)



$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \

core/combo/TARGET_linux-mips64.mk

+9 −0
Original line number Diff line number Diff line
@@ -79,6 +79,15 @@ ifeq ($(FORCE_MIPS_DEBUGGING),true) 
  TARGET_mips_CFLAGS += -fno-omit-frame-pointer

endif



# For mips r6 (both 32bit and 64bit), GDB cannot stop on a breakpoint

# if it is set on a compact branch. Turn generation of compact

# branches off, to allow GDB to work properly.

# Note: JIC instruction is not affected by this flag.

# TODO: Remove this after GDB is fixed.

ifeq ($(TARGET_ARCH),mips64)

TARGET_mips_CFLAGS += -mcompact-branches=never

endif



android_config_h := $(call select-android-config-h,linux-mips64)



TARGET_GLOBAL_CFLAGS += \