aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-10-09 23:43:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-10-09 23:43:24 +0000
commit777ebe86677f6fd88c87995652146b2ead19a95f (patch)
tree92a6c770565a28e253aa8491d49a3adc7e6ef29b
parent37953ee3feb60b84e43349df0b13544367ca1cd7 (diff)
parent14b467e840f8735e050b1844731c7747a7130525 (diff)
downloadandroid_bionic-777ebe86677f6fd88c87995652146b2ead19a95f.tar.gz
android_bionic-777ebe86677f6fd88c87995652146b2ead19a95f.tar.bz2
android_bionic-777ebe86677f6fd88c87995652146b2ead19a95f.zip
Merge "Fix MIPS build."
-rw-r--r--libc/arch-mips/bionic/cacheflush.cpp (renamed from libc/arch-mips/bionic/cacheflush.c)3
-rw-r--r--libc/arch-mips/mips.mk2
2 files changed, 2 insertions, 3 deletions
diff --git a/libc/arch-mips/bionic/cacheflush.c b/libc/arch-mips/bionic/cacheflush.cpp
index 2b03eee83..7955dd69d 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
diff --git a/libc/arch-mips/mips.mk b/libc/arch-mips/mips.mk
index 7a3c9789e..3f7094e78 100644
--- a/libc/arch-mips/mips.mk
+++ b/libc/arch-mips/mips.mk
@@ -5,7 +5,7 @@ _LIBC_ARCH_COMMON_SRC_FILES := \
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 \