Avoid endian.h include in MIPS64 string functions.

diff --git a/ChangeLog.mips b/ChangeLog.mips
index 65ff19d0a1fc7bbaab521b72035aa31c4a11c9c4..7b89f08a0deeac5f4526fec3b3424e4a50bea184 100644 (file)
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,9 @@
+2012-04-28  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/mips/mips64/memcpy.S: Don't include <endian.h>.  Test
+       __MIPSEB instead of __BYTE_ORDER.
+       * sysdeps/mips/mips64/memset.S: Likewise.
+
 2012-04-27  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/mips/configure.in (arch_minimum_kernel):

diff --git a/sysdeps/mips/mips64/memcpy.S b/sysdeps/mips/mips64/memcpy.S
index ae819f6d4f0f5252e9c937ac8072cf80dafa9e24..49ef34d0c6162b24aefb7c1e3b700f5e6ab17da6 100644 (file)
--- a/sysdeps/mips/mips64/memcpy.S
+++ b/sysdeps/mips/mips64/memcpy.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Hartvig Ekner <hartvige@mips.com>, 2002.
    Ported to mips3 n32/n64 by Alexandre Oliva <aoliva@redhat.com>
@@ -18,7 +18,6 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include <endian.h>
 #include <sys/asm.h>
 
 
@@ -26,7 +25,7 @@
        
    This could probably be optimized further.  */
 
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if __MIPSEB
 #  define LDHI ldl             /* high part is left in big-endian      */
 #  define SDHI sdl             /* high part is left in big-endian      */
 #  define LDLO ldr             /* low part is right in big-endian      */

diff --git a/sysdeps/mips/mips64/memset.S b/sysdeps/mips/mips64/memset.S
index 9800ed3b91cd24ec6a5ddf344c23486c205b7622..a2f9120e86bde6affb5d9ed52da61e589fa59227 100644 (file)
--- a/sysdeps/mips/mips64/memset.S
+++ b/sysdeps/mips/mips64/memset.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Hartvig Ekner <hartvige@mips.com>, 2002.
    Ported to mips3 n32/n64 by Alexandre Oliva <aoliva@redhat.com>
@@ -18,7 +18,6 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
-#include <endian.h>
 #include <sys/asm.h>
 
 
@@ -26,7 +25,7 @@
        
    This could probably be optimized further.  */
 
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if __MIPSEB
 # define SDHI  sdl             /* high part is left in big-endian      */
 #else
 # define SDHI  sdr             /* high part is right in little-endian  */