am 3b5a4b0c: Merge "Revert "[MIPS] Do not use compact branches until GDB supports them""

* commit '3b5a4b0c3394e45b766188e0bede4d5acdc0c678':
  Revert "[MIPS] Do not use compact branches until GDB supports them"
This commit is contained in:
Elliott Hughes 2015-06-17 17:19:50 +00:00 committed by Android Git Automerger
commit d1289f8bdb

View File

@ -38,16 +38,6 @@ LOCAL_CFLAGS += \
LOCAL_CFLAGS_arm += -D__work_around_b_19059885__ LOCAL_CFLAGS_arm += -D__work_around_b_19059885__
LOCAL_CFLAGS_x86 += -D__work_around_b_19059885__ LOCAL_CFLAGS_x86 += -D__work_around_b_19059885__
# For mips r6 (both 32bit and 64bit), GDB cannot stop on a breakpoint
# if rt.cpp is compiled with compact branches optimization.
# Unfortunately, we cannot turn generation of JIC compact branch off,
# but we can add unoptimized code which will allow GDB to insert a
# breakpoint on it.
# TODO: Remove this after GDB is fixed.
ifeq ($(TARGET_ARCH),mips64)
LOCAL_CFLAGS += -fno-omit-frame-pointer
endif
LOCAL_CONLYFLAGS += \ LOCAL_CONLYFLAGS += \
-std=gnu99 \ -std=gnu99 \