From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26235 invoked by alias); 4 Jun 2009 10:57:15 -0000 Received: (qmail 26222 invoked by uid 22791); 4 Jun 2009 10:57:14 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx2.redhat.com (HELO mx2.redhat.com) (66.187.237.31) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 04 Jun 2009 10:57:08 +0000 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n54Av6f1026673; Thu, 4 Jun 2009 06:57:06 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n54Av5nr030683; Thu, 4 Jun 2009 06:57:06 -0400 Received: from zebedee.pink (vpn-12-111.rdu.redhat.com [10.11.12.111]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n54Av4RH019529; Thu, 4 Jun 2009 06:57:04 -0400 Message-ID: <4A27A87F.2000405@redhat.com> Date: Thu, 04 Jun 2009 10:57:00 -0000 From: Andrew Haley User-Agent: Thunderbird 2.0.0.17 (X11/20081009) MIME-Version: 1.0 To: Anthony Green CC: Anthony Green , libffi-discuss@sourceware.org, gcc-patches , Java Patch List Subject: Re: libffi merge References: <4A255CF4.7030203@redhat.com> <4A265860.2050207@redhat.com> <4A26646A.80300@moxielogic.com> <4A26D4AC.8080507@redhat.com> <4A26DC78.6010508@redhat.com> <4A27A347.7070009@redhat.com> <4A27A508.2000409@redhat.com> In-Reply-To: <4A27A508.2000409@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2009-q2/txt/msg00109.txt.bz2 Andrew Haley wrote: > Andrew Haley wrote: >> Anthony Green wrote: >>> Andrew Haley wrote: >>>> Anthony Green wrote: >>>> >>>>> Andrew Haley wrote: >>>>> >>>>>> Andrew Haley wrote: >>>>>> >>>>>> >>>>>>> libffi upstream and gcc libffi are out of sync. >>>>>>> >>>>>>> I'm doing a two-way merge. Please don't commit patches to either >>>>>>> repo for >>>>>>> the next few days. > > There's a big cleanup in gcc but not libffi that makes merging very hard: > http://gcc.gnu.org/ml/gcc-patches/2006-04/msg00724.html > > I'm going to have to apply this to libffi to get any further with the > merge. A correction: a small part of it is not in libffi. A big chunk of the formatting diffs are now due to this change: 2008-02-14 Anthony Green * configure.ac: Bump version to 2.99.7. * configure, doc/stamp-vti, doc/version.texi: Rebuilt. * include/ffi.h.in LICENSE src/debug.c src/closures.c src/ffitest.c src/s390/sysv.S src/s390/ffitarget.h src/types.c src/m68k/ffitarget.h src/raw_api.c src/frv/ffi.c src/frv/ffitarget.h src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h src/powerpc/ffitarget.h src/pa/ffi.c src/pa/ffitarget.h src/pa/linux.S src/java_raw_api.c src/cris/ffitarget.h src/x86/ffi.c src/x86/sysv.S src/x86/unix64.S src/x86/win32.S src/x86/ffitarget.h src/x86/ffi64.c src/x86/darwin.S src/ia64/ffi.c src/ia64/ffitarget.h src/ia64/ia64_flags.h src/ia64/unix.S src/sparc/ffi.c src/sparc/v9.S src/sparc/ffitarget.h src/sparc/v8.S src/alpha/ffi.c src/alpha/ffitarget.h src/alpha/osf.S src/sh64/ffi.c src/sh64/sysv.S src/sh64/ffitarget.h src/mips/ffi.c src/mips/ffitarget.h src/mips/n32.S src/mips/o32.S src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h src/prep_cif.c: Update license text. This change isn't in gcc's libffi, but I don't know why. Anthony? Andrew.