From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13639 invoked by alias); 23 Dec 2011 23:42:48 -0000 Received: (qmail 13626 invoked by uid 22791); 23 Dec 2011 23:42:47 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,TW_FN X-Spam-Check-By: sourceware.org Received: from mail-iy0-f169.google.com (HELO mail-iy0-f169.google.com) (209.85.210.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 23 Dec 2011 23:42:33 +0000 Received: by iacb35 with SMTP id b35so16641822iac.0 for ; Fri, 23 Dec 2011 15:42:32 -0800 (PST) Received: by 10.42.176.196 with SMTP id bf4mr16674231icb.27.1324683752668; Fri, 23 Dec 2011 15:42:32 -0800 (PST) Received: from [192.168.80.129] (c-98-243-190-31.hsd1.mi.comcast.net. [98.243.190.31]) by mx.google.com with ESMTPS id pb6sm13124448igc.5.2011.12.23.15.42.30 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Dec 2011 15:42:31 -0800 (PST) Message-ID: <4EF511E4.5010201@gmail.com> Date: Fri, 23 Dec 2011 23:42:00 -0000 From: Jon Diekema Reply-To: jon.diekema@gmail.com User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.23) Gecko/20110921 Lightning/1.0b2 Thunderbird/3.1.15 ThunderBrowse/3.8 MIME-Version: 1.0 To: crossgcc@sourceware.org Subject: Re: eglibc-2_14 patch: Add protection on the __caddr_t typedef in usr/include/sys/types.h to avoid problems when caddr_t is defined. References: <69ABDB41F438EF499C150818A55F635B0DB5D670@CINMLVEM26.e2k.ad.ge.com> <201112211727.06660.vapier@gentoo.org> In-Reply-To: <201112211727.06660.vapier@gentoo.org> Content-Type: multipart/mixed; boundary="------------090702090707070402080502" X-IsSubscribed: yes Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org X-SW-Source: 2011-12/txt/msg00077.txt.bz2 --------------090702090707070402080502 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1378 On 12/21/2011 05:27 PM, Mike Frysinger wrote: > On Wednesday 21 December 2011 14:54:38 Diekema, Jon (GE Aviation, US) wrote: >> When using ct-ng 1.13.0, the following patch for eglibc-2_14 was needed >> for a i686-pc-mingw32-i686-pc-linux-gnu build. > > your patch is horribly mangled. please send with `git send-email`. > -mike Sorry, let's try this again. diff --git a/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch b/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch new file mode 100644 index 0000000..23d968e --- /dev/null +++ b/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch @@ -0,0 +1,28 @@ +Add protection on the __caddr_t typedef in usr/include/sys/types.h to +avoid problems when caddr_t is defined. + +--- ./posix/sys/types.h 2010-01-26 06:27:38.000000000 -0500 ++++ ./posix/sys/types.h 2011-11-17 11:39:03.662925595 -0500 +@@ -113,10 +113,21 @@ + + #ifdef __USE_BSD + # ifndef __daddr_t_defined ++# ifndef daddr_t + typedef __daddr_t daddr_t; +-typedef __caddr_t caddr_t; ++# else ++# define __daddr_t daddr_t ++# endif + # define __daddr_t_defined + # endif ++# ifndef __caddr_t_defined ++# ifndef caddr_t ++typedef __caddr_t caddr_t; ++# else ++# define __caddr_t caddr_t ++# endif ++# define __caddr_t_defined ++# endif + #endif + + #if (defined __USE_SVID || defined __USE_XOPEN) && !defined __key_t_defined --------------090702090707070402080502 Content-Type: text/x-patch; name="100-caddr_t-typedef-from-types.h.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="100-caddr_t-typedef-from-types.h.patch" Content-length: 1016 diff --git a/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch b/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch new file mode 100644 index 0000000..23d968e --- /dev/null +++ b/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch @@ -0,0 +1,28 @@ +Add protection on the __caddr_t typedef in usr/include/sys/types.h to +avoid problems when caddr_t is defined. + +--- ./posix/sys/types.h 2010-01-26 06:27:38.000000000 -0500 ++++ ./posix/sys/types.h 2011-11-17 11:39:03.662925595 -0500 +@@ -113,10 +113,21 @@ + + #ifdef __USE_BSD + # ifndef __daddr_t_defined ++# ifndef daddr_t + typedef __daddr_t daddr_t; +-typedef __caddr_t caddr_t; ++# else ++# define __daddr_t daddr_t ++# endif + # define __daddr_t_defined + # endif ++# ifndef __caddr_t_defined ++# ifndef caddr_t ++typedef __caddr_t caddr_t; ++# else ++# define __caddr_t caddr_t ++# endif ++# define __caddr_t_defined ++# endif + #endif + + #if (defined __USE_SVID || defined __USE_XOPEN) && !defined __key_t_defined --------------090702090707070402080502 Content-Type: text/plain; charset=us-ascii Content-length: 71 -- For unsubscribe information see http://sourceware.org/lists.html#faq --------------090702090707070402080502--