am b93b0e5c: am 4683d846: am 1fe277e4: Merge "Insulate libportable from bionic changes."

* commit 'b93b0e5cf8ce008a3c5f082bbc99e86a1e4a97ea': Insulate libportable from bionic changes.
2014-02-20 20:59:12 -08:00
parent 3b842a8628 b93b0e5cf8
commit 9f11a471e1
2 changed files with 5 additions and 0 deletions
--- a/ndk/sources/android/libportable/arch-mips/_setjmp.S
+++ b/ndk/sources/android/libportable/arch-mips/_setjmp.S
@@ -29,6 +29,7 @@
 *
 */

+#include <asm-generic/portability.h>
 #include <machine/asm.h>
 #include <machine/regnum.h>

--- a/ndk/sources/android/libportable/common/include/asm-generic/portability.h
+++ b/ndk/sources/android/libportable/common/include/asm-generic/portability.h
@@ -28,4 +28,8 @@
 #define REAL(f)     __real_ ## f
 #endif

+#if defined(__mips__) && !defined(END)
+#define END(f) .cfi_endproc; .end f
+#endif
+
 #endif /* _ASM_PORTABILITY_H_ */