diff options
| author | Steve Ellcey <sellcey@mips.com> | 2015-02-17 13:38:49 -0800 |
|---|---|---|
| committer | Steve Ellcey <sellcey@mips.com> | 2015-02-17 13:38:49 -0800 |
| commit | e72ad0ef31a5be84c43cc826db97b8c74881faf4 (patch) | |
| tree | 8453ad920994006a0d0f2634ae2bd5b4fd21b03a | |
| parent | 2caa4099dec36b2744b4a0e0fbf6a0ab41ebd9b3 (diff) | |
| download | glibc-e72ad0ef31a5be84c43cc826db97b8c74881faf4.tar.gz glibc-e72ad0ef31a5be84c43cc826db97b8c74881faf4.tar.xz glibc-e72ad0ef31a5be84c43cc826db97b8c74881faf4.zip | |
2015-02-17 Steve Ellcey <sellcey@imgtec.com>
* sysdeps/mips/memcpy.S: Move R6 PREFETCH_STORE_HINT check. * sysdeps/mips/memset.S: Ditto.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/mips/memcpy.S | 17 | ||||
| -rw-r--r-- | sysdeps/mips/memset.S | 15 |
3 files changed, 21 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index 606d80f82b..c44ce0dc24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 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. 2015-02-17 Stefan Liebler <stli@linux.vnet.ibm.com> diff --git a/sysdeps/mips/memcpy.S b/sysdeps/mips/memcpy.S index a9ac059e14..c85935b811 100644 --- 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 cf16b2644a..864ab07c38 100644 --- 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 |