diff options
| author | Elliott Hughes <enh@google.com> | 2014-06-08 09:03:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-08 09:03:18 +0000 |
| commit | fbc8ae15b2eac98253fe979abbd9c0253df91b67 (patch) | |
| tree | 8d6d557bb19aeb32f8e7c5da51c496435c90da59 /ndk | |
| parent | 9a6e791e6cc37bd832e9a1506ddae1298a34ad6a (diff) | |
| parent | 7d1aa27155b6b6dbac9290d2c073b20be96f3fb4 (diff) | |
am 7d1aa271: am 55dc8e65: am 91e2c5dc: Merge "Fix libportable build breakage."
* commit '7d1aa27155b6b6dbac9290d2c073b20be96f3fb4':
Fix libportable build breakage.
Diffstat (limited to 'ndk')
| -rw-r--r-- | ndk/sources/android/libportable/arch-mips/_setjmp.S | 2 | ||||
| -rw-r--r-- | ndk/sources/android/libportable/arch-mips/setjmp.S | 1 |
2 files changed, 0 insertions, 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 |