commit 777ebe86677f6fd88c87995652146b2ead19a95f
author Elliott Hughes <enh@google.com> Wed Oct 09 23:43:23 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 09 23:43:24 2013 +0000
tree 92a6c770565a28e253aa8491d49a3adc7e6ef29b
parent 37953ee3feb60b84e43349df0b13544367ca1cd7
parent 14b467e840f8735e050b1844731c7747a7130525

Merge "Fix MIPS build."

libc/arch-mips/bionic/cacheflush.cpp

diff --git a/libc/arch-mips/bionic/cacheflush.c b/libc/arch-mips/bionic/cacheflush.cpp
similarity index 97%
rename from libc/arch-mips/bionic/cacheflush.c
rename to libc/arch-mips/bionic/cacheflush.cpp
index 2b03eee..7955dd6 100644
--- a/libc/arch-mips/bionic/cacheflush.c
+++ b/libc/arch-mips/bionic/cacheflush.cpp
@@ -55,8 +55,7 @@
 #endif
 
 /* This is the Android signature */
-int cacheflush (long start, long end, long flags)
-{
+int cacheflush (long start, long end, long /*flags*/) {
 	if (end < start) {
 		/*
 		 * It looks like this is really MIPS style cacheflush call

libc/arch-mips/mips.mk

diff --git a/libc/arch-mips/mips.mk b/libc/arch-mips/mips.mk
index 7a3c978..3f7094e 100644
--- a/libc/arch-mips/mips.mk
+++ b/libc/arch-mips/mips.mk
@@ -5,7 +5,7 @@
     arch-mips/bionic/_setjmp.S \
     arch-mips/bionic/futex_mips.S \
     arch-mips/bionic/bzero.S \
-    arch-mips/bionic/cacheflush.c \
+    arch-mips/bionic/cacheflush.cpp \
     arch-mips/bionic/clone.S \
     arch-mips/bionic/ffs.S \
     arch-mips/bionic/memcmp16.S \