From 896216ffd10dda92c9e71d260205a3cd98fb230f Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sat, 28 Apr 2012 03:41:29 -0700 Subject: [PATCH] Avoid endian.h include in MIPS64 string functions. --- ChangeLog.mips | 6 ++++++ sysdeps/mips/mips64/memcpy.S | 5 ++--- sysdeps/mips/mips64/memset.S | 5 ++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog.mips b/ChangeLog.mips index 65ff19d0a1..7b89f08a0d 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,3 +1,9 @@ +2012-04-28 Joseph Myers + + * sysdeps/mips/mips64/memcpy.S: Don't include . Test + __MIPSEB instead of __BYTE_ORDER. + * sysdeps/mips/mips64/memset.S: Likewise. + 2012-04-27 Joseph Myers * 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 ae819f6d4f..49ef34d0c6 100644 --- 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 , 2002. Ported to mips3 n32/n64 by Alexandre Oliva @@ -18,7 +18,6 @@ . */ #include -#include #include @@ -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 9800ed3b91..a2f9120e86 100644 --- 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 , 2002. Ported to mips3 n32/n64 by Alexandre Oliva @@ -18,7 +18,6 @@ . */ #include -#include #include @@ -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 */ -- 2.43.5