From fc9ac9f1731f771c22958e60da047770c5a14d7c Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 7 Jun 2014 22:24:44 -0700 Subject: [PATCH] Fix libportable build breakage. Change-Id: Ic85e36cf55b7486b50fc9f1513f10a8ade5e86e9 --- ndk/sources/android/libportable/arch-mips/_setjmp.S | 2 -- ndk/sources/android/libportable/arch-mips/setjmp.S | 1 - 2 files changed, 3 deletions(-) diff --git a/ndk/sources/android/libportable/arch-mips/_setjmp.S b/ndk/sources/android/libportable/arch-mips/_setjmp.S index 285ad7fd5..b05127614 100644 --- a/ndk/sources/android/libportable/arch-mips/_setjmp.S +++ b/ndk/sources/android/libportable/arch-mips/_setjmp.S @@ -185,8 +185,6 @@ LEAF(_longjmp_portable, FRAMESZ) move v0, a1 botch: - jal longjmperror - nop jal abort nop RESTORE_GP64 diff --git a/ndk/sources/android/libportable/arch-mips/setjmp.S b/ndk/sources/android/libportable/arch-mips/setjmp.S index 15329725e..fcfccec2b 100644 --- a/ndk/sources/android/libportable/arch-mips/setjmp.S +++ b/ndk/sources/android/libportable/arch-mips/setjmp.S @@ -140,7 +140,6 @@ NON_LEAF(WRAP(setjmp), FRAMESZ, ra) j ra botch: - jal longjmperror jal abort RESTORE_GP64 PTR_ADDU sp, FRAMESZ