From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14915 invoked by alias); 26 Apr 2012 19:25:00 -0000 Received: (qmail 14906 invoked by uid 22791); 26 Apr 2012 19:25:00 -0000 X-SWARE-Spam-Status: No, hits=-3.3 required=5.0 tests=AWL,BAYES_00,FROM_12LTRDOM,KHOP_RCVD_UNTRUST,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; Thu, 26 Apr 2012 19:24:47 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1SNUJ4-0000GU-Fr from joseph_myers@mentor.com for libc-ports@sourceware.org; Thu, 26 Apr 2012 12:24:46 -0700 Received: from digraph.polyomino.org.uk ([172.16.63.104]) by EU1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); Thu, 26 Apr 2012 20:24:44 +0100 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.74) (envelope-from ) id 1SNUJ3-0000ag-CY for libc-ports@sourceware.org; Thu, 26 Apr 2012 19:24:45 +0000 Date: Thu, 26 Apr 2012 19:25:00 -0000 From: "Joseph S. Myers" To: libc-ports@sourceware.org Subject: Avoid endian.h include in MIPS string functions Message-ID: 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/msg00168.txt.bz2 Similar to a recent SH libc change, I've applied this patch to avoid MIPS string .S functions including and getting errors from C source code from that header. diff --git a/ChangeLog.mips b/ChangeLog.mips index 0b4a493..3d3678b 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,5 +1,9 @@ 2012-04-26 Joseph Myers + * sysdeps/mips/memcpy.S: Don't include . Test __MIPSEB + instead of __BYTE_ORDER. + * sysdeps/mips/memset.S: Likewise. + * sysdeps/unix/sysv/linux/mips/kernel_rt_sigframe.h (struct kernel_rt_sigframe): Use siginfo_t instead of struct siginfo. diff --git a/sysdeps/mips/memcpy.S b/sysdeps/mips/memcpy.S index ec1b98a..753f67c 100644 --- a/sysdeps/mips/memcpy.S +++ b/sysdeps/mips/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. @@ -17,12 +17,11 @@ . */ #include -#include /* void *memcpy(void *s1, const void *s2, size_t n); */ -#if __BYTE_ORDER == __BIG_ENDIAN +#if __MIPSEB # define LWHI lwl /* high part is left in big-endian */ # define SWHI swl /* high part is left in big-endian */ # define LWLO lwr /* low part is right in big-endian */ diff --git a/sysdeps/mips/memset.S b/sysdeps/mips/memset.S index 1df7981..30a0ba4 100644 --- a/sysdeps/mips/memset.S +++ b/sysdeps/mips/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. @@ -17,12 +17,11 @@ . */ #include -#include /* void *memset(void *s, int c, size_t n). */ -#if __BYTE_ORDER == __BIG_ENDIAN +#if __MIPSEB # define SWHI swl /* high part is left in big-endian */ #else # define SWHI swr /* high part is right in little-endian */ -- Joseph S. Myers joseph@codesourcery.com