diff options
| author | Elliott Hughes <enh@google.com> | 2013-10-09 16:46:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-09 16:46:33 -0700 |
| commit | c7559aeaf17a7c38392d2dc8f79c77316a24c8c0 (patch) | |
| tree | 92a6c770565a28e253aa8491d49a3adc7e6ef29b | |
| parent | aa3c17e8f8b9b3b5b8dc3c7c0fbe85b774f83722 (diff) | |
| parent | 777ebe86677f6fd88c87995652146b2ead19a95f (diff) | |
| download | bionic-c7559aeaf17a7c38392d2dc8f79c77316a24c8c0.zip bionic-c7559aeaf17a7c38392d2dc8f79c77316a24c8c0.tar.gz bionic-c7559aeaf17a7c38392d2dc8f79c77316a24c8c0.tar.bz2 | |
am 777ebe86: Merge "Fix MIPS build."
* commit '777ebe86677f6fd88c87995652146b2ead19a95f':
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.mk | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libc/arch-mips/bionic/cacheflush.c b/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 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 @@ _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 \ |