From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23228 invoked by alias); 28 Apr 2012 10:42:46 -0000 Received: (qmail 23220 invoked by uid 22791); 28 Apr 2012 10:42:45 -0000 X-SWARE-Spam-Status: No, hits=-4.2 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 28 Apr 2012 10:42:20 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1SO56Z-0006Py-Ec from joseph_myers@mentor.com for libc-ports@sourceware.org; Sat, 28 Apr 2012 03:42:19 -0700 Received: from digraph.polyomino.org.uk ([172.16.63.104]) by EU1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); Sat, 28 Apr 2012 11:42:17 +0100 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.74) (envelope-from ) id 1SO56Y-00041S-L4 for libc-ports@sourceware.org; Sat, 28 Apr 2012 10:42:18 +0000 Date: Sat, 28 Apr 2012 10:42:00 -0000 From: "Joseph S. Myers" To: libc-ports@sourceware.org Subject: Re: Avoid endian.h include in MIPS string functions In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2012-04/txt/msg00206.txt.bz2 I've now applied a corresponding fix to the 64-bit versions as well. diff --git a/ChangeLog.mips b/ChangeLog.mips index 65ff19d..7b89f08 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 ae819f6..49ef34d 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 9800ed3..a2f9120 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 */ -- Joseph S. Myers joseph@codesourcery.com