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

* commit '1fe277e4f991cfe6963fe362f064a68c50170532': Insulate libportable from bionic changes.
2014-02-20 22:01:49 +00:00
parent 5624f5b976 1fe277e4f9
commit 4683d8465c
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_ */