From e525154e84b6e9effadfbb5f162785e3aff24eb3 Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Fri, 13 Feb 2015 17:38:06 -0800 Subject: [PATCH] 2015-02-13 Steve Ellcey * sysdeps/mips/bits/endian.h (__MIPSEB): Use #ifdef instead of #if. * sysdeps/mips/memcpy.S (__MIPSEB): Ditto. * sysdeps/mips/memset.S (__MIPSEB): Ditto. --- ChangeLog | 6 ++++++ sysdeps/mips/bits/endian.h | 2 +- sysdeps/mips/memcpy.S | 6 +++--- sysdeps/mips/memset.S | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8da63e7e54..4da75ed8a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-02-13 Steve Ellcey + + * sysdeps/mips/bits/endian.h (__MIPSEB): Use #ifdef instead of #if. + * sysdeps/mips/memcpy.S (__MIPSEB): Ditto. + * sysdeps/mips/memset.S (__MIPSEB): Ditto. + 2015-02-13 Roland McGrath * sysdeps/generic/c++-types.data: New file. diff --git a/sysdeps/mips/bits/endian.h b/sysdeps/mips/bits/endian.h index 9586104ccd..43ce0098a4 100644 --- a/sysdeps/mips/bits/endian.h +++ b/sysdeps/mips/bits/endian.h @@ -5,7 +5,7 @@ # error "Never use directly; include instead." #endif -#if __MIPSEB +#ifdef __MIPSEB # define __BYTE_ORDER __BIG_ENDIAN #endif #if __MIPSEL diff --git a/sysdeps/mips/memcpy.S b/sysdeps/mips/memcpy.S index fcd7c0368c..715abcf172 100644 --- a/sysdeps/mips/memcpy.S +++ b/sysdeps/mips/memcpy.S @@ -225,7 +225,7 @@ #ifdef USE_DOUBLE # define C_ST sd # define C_LD ld -# if __MIPSEB +# ifdef __MIPSEB # define C_LDHI ldl /* high part is left in big-endian */ # define C_STHI sdl /* high part is left in big-endian */ # define C_LDLO ldr /* low part is right in big-endian */ @@ -240,7 +240,7 @@ #else # define C_ST sw # define C_LD lw -# if __MIPSEB +# ifdef __MIPSEB # define C_LDHI lwl /* high part is left in big-endian */ # define C_STHI swl /* high part is left in big-endian */ # define C_LDLO lwr /* low part is right in big-endian */ @@ -767,7 +767,7 @@ L(ua_smallCopy_loop): #else /* R6_CODE */ -# if __MIPSEB +# ifdef __MIPSEB # define SWAP_REGS(X,Y) X, Y # define ALIGN_OFFSET(N) (N) # else diff --git a/sysdeps/mips/memset.S b/sysdeps/mips/memset.S index 0a9b5cae46..940a2258db 100644 --- a/sysdeps/mips/memset.S +++ b/sysdeps/mips/memset.S @@ -170,14 +170,14 @@ #ifdef USE_DOUBLE # define C_ST sd -# if __MIPSEB +# ifdef __MIPSEB # define C_STHI sdl /* high part is left in big-endian */ # else # define C_STHI sdr /* high part is right in little-endian */ # endif #else # define C_ST sw -# if __MIPSEB +# ifdef __MIPSEB # define C_STHI swl /* high part is left in big-endian */ # else # define C_STHI swr /* high part is right in little-endian */