This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: libffi merge


Correct a misapplied merge from gcc.

Andrew.


2009-06-04  Andrew Haley  <aph@redhat.com>

        * src/powerpc/ffitarget.h: Fix misapplied merge from gcc.

Index: src/powerpc/ffitarget.h
===================================================================
RCS file: /cvs/libffi/libffi/src/powerpc/ffitarget.h,v
retrieving revision 1.5
diff -c -r1.5 ffitarget.h
*** src/powerpc/ffitarget.h     19 Dec 2008 15:47:44 -0000      1.5
--- src/powerpc/ffitarget.h     4 Jun 2009 16:28:19 -0000
***************
*** 95,106 ****
  /* For additional types like the below, take care about the order in
     ppc_closures.S. They must follow after the FFI_TYPE_LAST.  */

  /* Needed for FFI_SYSV small structure returns.
     We use two flag bits, (FLAG_SYSV_SMST_R3, FLAG_SYSV_SMST_R4) which are
     defined in ffi.c, to determine the exact return type and its size.  */
- #define FFI_TYPE_UINT128 (FFI_TYPE_LAST + 1)
-
- /* Needed for FFI_SYSV small structure returns.  */
  #define FFI_SYSV_TYPE_SMALL_STRUCT (FFI_TYPE_LAST + 2)

  #if defined(POWERPC64) || defined(POWERPC_AIX)
--- 95,106 ----
  /* For additional types like the below, take care about the order in
     ppc_closures.S. They must follow after the FFI_TYPE_LAST.  */

+ /* Needed for soft-float long-double-128 support.  */
+ #define FFI_TYPE_UINT128 (FFI_TYPE_LAST + 1)
+
  /* Needed for FFI_SYSV small structure returns.
     We use two flag bits, (FLAG_SYSV_SMST_R3, FLAG_SYSV_SMST_R4) which are
     defined in ffi.c, to determine the exact return type and its size.  */
  #define FFI_SYSV_TYPE_SMALL_STRUCT (FFI_TYPE_LAST + 2)

  #if defined(POWERPC64) || defined(POWERPC_AIX)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]