am 55dc8e65: am 91e2c5dc: Merge "Fix libportable build breakage."

* commit '55dc8e65c24e3b0dd99049d9552b6f5c96ba5eea': Fix libportable build breakage.
2014-06-08 08:29:35 +00:00
parent fcabb6e7aa 55dc8e65c2
commit 7d1aa27155
2 changed files with 0 additions and 3 deletions
--- 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
--- 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