From aa102a6a578981d05c60d7a3f037312133da40ee Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Tue, 19 Feb 2013 07:31:04 +0000
Subject: [PATCH] 	* libc/machine/mips/memcpy.S: Fix USE_PREFETCH check.

---
 newlib/ChangeLog                  | 4 ++++
 newlib/libc/machine/mips/memcpy.S | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 4819ddb17..7b63386f8 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-19  Steve Ellcey  <sellcey@mips.com>
+
+	* libc/machine/mips/memcpy.S: Fix USE_PREFETCH check.
+
 2013-02-01  Nick Clifton  <nickc@redhat.com>
 
 	* libc/sys/sysnecv850/crt0.S: Add recognition of the e3v5
diff --git a/newlib/libc/machine/mips/memcpy.S b/newlib/libc/machine/mips/memcpy.S
index 574f54938..8c47fa5e4 100644
--- a/newlib/libc/machine/mips/memcpy.S
+++ b/newlib/libc/machine/mips/memcpy.S
@@ -49,8 +49,11 @@
 #include <sys/asm.h>
 #endif
 
-#if (_MIPS_ISA == _MIPS_ISA_MIPS4) || (_MIPS_ISA == _MIPS_ISA_MIPS5) || \
-    (_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
+/* Check to see if the MIPS architecture we are compiling for supports
+ * prefetching.
+ */
+
+#if (__mips == 4) || (__mips == 5) || (__mips == 32) || (__mips == 64)
 #ifndef DISABLE_PREFETCH
 #define USE_PREFETCH
 #endif