2015-02-17 Steve Ellcey <sellcey@imgtec.com>

	* sysdeps/mips/memcpy.S: Move R6 PREFETCH_STORE_HINT check.
	* sysdeps/mips/memset.S: Ditto.

diff --git a/ChangeLog b/ChangeLog
index 606d80f82b07122bd1a60f433eb8c6d3f70f7894..c44ce0dc240be6322072496da44c000cc2813040 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-17  Steve Ellcey  <sellcey@imgtec.com>
+
+       * sysdeps/mips/memcpy.S: Move R6 PREFETCH_STORE_HINT check.
+       * sysdeps/mips/memset.S: Ditto.
+
 2015-02-17  Steve Ellcey  <sellcey@imgtec.com>
 
        * sysdeps/mips/bits/endian.h (__MIPSEL): Use #ifdef instead of #if.

diff --git a/sysdeps/mips/memcpy.S b/sysdeps/mips/memcpy.S
index a9ac059e14fc15185e6dabf9be096f1ddbb35331..c85935b811912102d1892b57e37f51f7961e63cb 100644 (file)
--- a/sysdeps/mips/memcpy.S
+++ b/sysdeps/mips/memcpy.S
@@ -50,15 +50,6 @@
 # endif
 #endif
 
-
-#if __mips_isa_rev > 5
-# if (PREFETCH_STORE_HINT == PREFETCH_HINT_PREPAREFORSTORE)
-#  undef PREFETCH_STORE_HINT
-#  define PREFETCH_STORE_HINT PREFETCH_HINT_STORE_STREAMED
-# endif
-# define R6_CODE
-#endif
-
 /* Some asm.h files do not have the L macro definition.  */
 #ifndef L
 # if _MIPS_SIM == _ABIO32
@@ -196,6 +187,14 @@
 # define PREFETCH_FOR_STORE(offset, reg)
 #endif
 
+#if __mips_isa_rev > 5
+# if (PREFETCH_STORE_HINT == PREFETCH_HINT_PREPAREFORSTORE)
+#  undef PREFETCH_STORE_HINT
+#  define PREFETCH_STORE_HINT PREFETCH_HINT_STORE_STREAMED
+# endif
+# define R6_CODE
+#endif
+
 /* Allow the routine to be named something else if desired.  */
 #ifndef MEMCPY_NAME
 # define MEMCPY_NAME memcpy

diff --git a/sysdeps/mips/memset.S b/sysdeps/mips/memset.S
index cf16b2644a55044ba6b1fe5189aa0e38e3215fd5..864ab07c38f61851c2081558b6baa2b2cf732385 100644 (file)
--- a/sysdeps/mips/memset.S
+++ b/sysdeps/mips/memset.S
@@ -54,13 +54,6 @@
 # endif
 #endif
 
-#if __mips_isa_rev > 5
-# if (PREFETCH_STORE_HINT == PREFETCH_HINT_PREPAREFORSTORE)
-#  undef PREFETCH_STORE_HINT
-#  define PREFETCH_STORE_HINT PREFETCH_HINT_STORE_STREAMED
-# endif
-# define R6_CODE
-#endif
 
 /* Some asm.h files do not have the L macro definition.  */
 #ifndef L
@@ -159,6 +152,14 @@
 # define PREFETCH_FOR_STORE(offset, reg)
 #endif
 
+#if __mips_isa_rev > 5
+# if (PREFETCH_STORE_HINT == PREFETCH_HINT_PREPAREFORSTORE)
+#  undef PREFETCH_STORE_HINT
+#  define PREFETCH_STORE_HINT PREFETCH_HINT_STORE_STREAMED
+# endif
+# define R6_CODE
+#endif
+
 /* Allow the routine to be named something else if desired.  */
 #ifndef MEMSET_NAME
 # define MEMSET_NAME memset