From 72af45c1166fc72842ec79a94cd5eebd966681f6 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 20 Feb 2014 11:19:32 -0800
Subject: [PATCH] Insulate libportable from bionic changes.

Really libportable should take its own copy of BSD's <machine/asm.h>,
rather than relying on bionic's hacked-about copies.

Change-Id: I02248045a903dc4ca0d6ed1054ecb1cd54da335e
---
 ndk/sources/android/libportable/arch-mips/_setjmp.S           | 1 +
 .../libportable/common/include/asm-generic/portability.h      | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ndk/sources/android/libportable/arch-mips/_setjmp.S b/ndk/sources/android/libportable/arch-mips/_setjmp.S
index bceeff7b8..285ad7fd5 100644
--- 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>
 
diff --git a/ndk/sources/android/libportable/common/include/asm-generic/portability.h b/ndk/sources/android/libportable/common/include/asm-generic/portability.h
index a575b9527..31fcb079e 100644
--- 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_ */