diff --git a/ndk/sources/android/libportable/arch-mips/signal.c b/ndk/sources/android/libportable/arch-mips/signal.c
index 0c38d1493..c37f6d260 100644
--- a/ndk/sources/android/libportable/arch-mips/signal.c
+++ b/ndk/sources/android/libportable/arch-mips/signal.c
@@ -174,7 +174,7 @@ __hidden char *map_mips_signum_to_name(int mips_signum)
     case SIGXCPU:       name = "SIGXCPU:30";    break;
     case SIGXFSZ:       name = "SIGXFSZ:31";    break;
 
-    case SIGRTMIN:      name = "SIGRTMIN:32";   break;
+    case __SIGRTMIN:    name = "SIGRTMIN:32";   break;
     case SIGRT_1:       name = "SIGRT_1:33";    break;
     case SIGRT_2:       name = "SIGRT_2:34";    break;
     case SIGRT_3:       name = "SIGRT_3:35";    break;
@@ -210,7 +210,7 @@ __hidden char *map_mips_signum_to_name(int mips_signum)
 
     /* NOTE: SIGRT_33...SIGRTMAX-1 Not printed */
 
-    case SIGRTMAX:      name = "SIGRTMAX:128";  break;
+    case __SIGRTMAX:    name = "SIGRTMAX:128";  break;
     default:            name = "<<UNKNOWN>>";   break;
     }
     return name;
@@ -327,8 +327,8 @@ __hidden int signum_pton(int portable_signum)
      * NOTE: SIGRTMAX_PORTABLE == 64 but SIGRTMAX == 128.
      */
     case SIGRTMIN_PORTABLE...SIGRTMAX_PORTABLE:         /* 32 ... 64 */
-        ASSERT(SIGRTMIN_PORTABLE == SIGRTMIN);
-        ASSERT(SIGRTMAX_PORTABLE <= SIGRTMAX);
+        ASSERT(SIGRTMIN_PORTABLE == __SIGRTMIN);
+        ASSERT(SIGRTMAX_PORTABLE <= __SIGRTMAX);
         return portable_signum;
 
     default:
@@ -470,18 +470,18 @@ __hidden int signum_ntop(int mips_signum)
      * Mapping lower 32 Real Time signals to identical Portable signal numbers.
      * NOTE: SIGRTMAX_PORTABLE == 64 but SIGRTMAX == 128.
      */
-    case SIGRTMIN...SIGRTMAX_PORTABLE:              /* 32 ... 64 */
-        ASSERT(SIGRTMIN == SIGRTMIN_PORTABLE);
-        ASSERT(SIGRTMAX >= SIGRTMAX_PORTABLE);
+    case __SIGRTMIN...SIGRTMAX_PORTABLE:              /* 32 ... 64 */
+        ASSERT(__SIGRTMIN == SIGRTMIN_PORTABLE);
+        ASSERT(__SIGRTMAX >= SIGRTMAX_PORTABLE);
         return mips_signum;
 
    /*
     * Mapping upper 63 Native Real Time signals to the last Portable signal number.
     * Shouldn't even be possible to be using these signals.
     */
-    case (SIGRTMAX_PORTABLE+1)...SIGRTMAX:          /* 65 ... 128 */
-        ASSERT(SIGRTMIN == SIGRTMIN_PORTABLE);
-        ASSERT(SIGRTMAX >= SIGRTMAX_PORTABLE);
+    case (SIGRTMAX_PORTABLE+1)...__SIGRTMAX:          /* 65 ... 128 */
+        ASSERT(__SIGRTMIN == SIGRTMIN_PORTABLE);
+        ASSERT(__SIGRTMAX >= SIGRTMAX_PORTABLE);
 
         ALOGE("%s: mips_signum:%d Can't be mapped to a unique portable signal;", __func__,
                    mips_signum);
diff --git a/ndk/sources/android/libportable/common/include/asm/signal_portable.h b/ndk/sources/android/libportable/common/include/asm/signal_portable.h
index a9608cc04..63f9224ad 100644
--- a/ndk/sources/android/libportable/common/include/asm/signal_portable.h
+++ b/ndk/sources/android/libportable/common/include/asm/signal_portable.h
@@ -103,42 +103,42 @@ typedef unsigned long sigset_portable_t;
  *    lib-portable application can interact with. MIPS has
  *    an additional 63 signals.
  */
-#define SIGRT_1 (SIGRTMIN + 1)
-#define SIGRT_2 (SIGRTMIN + 2)
-#define SIGRT_3 (SIGRTMIN + 3)
-#define SIGRT_4 (SIGRTMIN + 4)
-#define SIGRT_5 (SIGRTMIN + 5)
-#define SIGRT_5 (SIGRTMIN + 5)
-#define SIGRT_6 (SIGRTMIN + 6)
-#define SIGRT_7 (SIGRTMIN + 7)
-#define SIGRT_8 (SIGRTMIN + 8)
-#define SIGRT_9 (SIGRTMIN + 9)
-#define SIGRT_10 (SIGRTMIN + 10)
-#define SIGRT_11 (SIGRTMIN + 11)
-#define SIGRT_12 (SIGRTMIN + 12)
-#define SIGRT_13 (SIGRTMIN + 13)
-#define SIGRT_14 (SIGRTMIN + 14)
-#define SIGRT_15 (SIGRTMIN + 15)
-#define SIGRT_15 (SIGRTMIN + 15)
-#define SIGRT_16 (SIGRTMIN + 16)
-#define SIGRT_17 (SIGRTMIN + 17)
-#define SIGRT_18 (SIGRTMIN + 18)
-#define SIGRT_19 (SIGRTMIN + 19)
-#define SIGRT_20 (SIGRTMIN + 20)
-#define SIGRT_20 (SIGRTMIN + 20)
-#define SIGRT_21 (SIGRTMIN + 21)
-#define SIGRT_22 (SIGRTMIN + 22)
-#define SIGRT_23 (SIGRTMIN + 23)
-#define SIGRT_24 (SIGRTMIN + 24)
-#define SIGRT_25 (SIGRTMIN + 25)
-#define SIGRT_25 (SIGRTMIN + 25)
-#define SIGRT_26 (SIGRTMIN + 26)
-#define SIGRT_27 (SIGRTMIN + 27)
-#define SIGRT_28 (SIGRTMIN + 28)
-#define SIGRT_29 (SIGRTMIN + 29)
-#define SIGRT_30 (SIGRTMIN + 30)
-#define SIGRT_31 (SIGRTMIN + 31)
-#define SIGRT_32 (SIGRTMIN + 32)
+#define SIGRT_1 (__SIGRTMIN + 1)
+#define SIGRT_2 (__SIGRTMIN + 2)
+#define SIGRT_3 (__SIGRTMIN + 3)
+#define SIGRT_4 (__SIGRTMIN + 4)
+#define SIGRT_5 (__SIGRTMIN + 5)
+#define SIGRT_5 (__SIGRTMIN + 5)
+#define SIGRT_6 (__SIGRTMIN + 6)
+#define SIGRT_7 (__SIGRTMIN + 7)
+#define SIGRT_8 (__SIGRTMIN + 8)
+#define SIGRT_9 (__SIGRTMIN + 9)
+#define SIGRT_10 (__SIGRTMIN + 10)
+#define SIGRT_11 (__SIGRTMIN + 11)
+#define SIGRT_12 (__SIGRTMIN + 12)
+#define SIGRT_13 (__SIGRTMIN + 13)
+#define SIGRT_14 (__SIGRTMIN + 14)
+#define SIGRT_15 (__SIGRTMIN + 15)
+#define SIGRT_15 (__SIGRTMIN + 15)
+#define SIGRT_16 (__SIGRTMIN + 16)
+#define SIGRT_17 (__SIGRTMIN + 17)
+#define SIGRT_18 (__SIGRTMIN + 18)
+#define SIGRT_19 (__SIGRTMIN + 19)
+#define SIGRT_20 (__SIGRTMIN + 20)
+#define SIGRT_20 (__SIGRTMIN + 20)
+#define SIGRT_21 (__SIGRTMIN + 21)
+#define SIGRT_22 (__SIGRTMIN + 22)
+#define SIGRT_23 (__SIGRTMIN + 23)
+#define SIGRT_24 (__SIGRTMIN + 24)
+#define SIGRT_25 (__SIGRTMIN + 25)
+#define SIGRT_25 (__SIGRTMIN + 25)
+#define SIGRT_26 (__SIGRTMIN + 26)
+#define SIGRT_27 (__SIGRTMIN + 27)
+#define SIGRT_28 (__SIGRTMIN + 28)
+#define SIGRT_29 (__SIGRTMIN + 29)
+#define SIGRT_30 (__SIGRTMIN + 30)
+#define SIGRT_31 (__SIGRTMIN + 31)
+#define SIGRT_32 (__SIGRTMIN + 32)
 /*
  * NOTE: Native signals SIGRT_33 ... SIGRTMAX
  * can't be used by a lib-portable application.