Re: Support PowerPC64 ELFv2 ABI

[Alan Modra <amodra@gmail.com>]

On Thu, Nov 14, 2013 at 01:55:12AM +1030, Alan Modra wrote:
> Finally, this adds _CALL_ELF == 2 support.  ELFv1 objects can't be
> linked with ELFv2 objects, so this is one case where preprocessor
> tests in ffi.c are fine.  Also, there is no need to define a new
> FFI_ELFv2 or somesuch value in enum ffi_abi.  FFI_LINUX64 will happily
> serve both ABIs.

Oops.  This one contained an error introduced by last minute changes,
and I didn't wait for my le bootstrap to finish last night before
posting..

	* src/powerpc/ffi.c (ffi_prep_cif_machdep_core): Use #if _CALL_ELF
	test to select parameter save sizing for ELFv2 vs. ELFv1.

diff --git a/src/powerpc/ffi.c b/src/powerpc/ffi.c
index 69356a2..feb2144 100644
--- a/src/powerpc/ffi.c
+++ b/src/powerpc/ffi.c
@@ -1072,13 +1072,13 @@ ffi_prep_cif_machdep_core (ffi_cif *cif)
 #endif
 
       /* Stack space.  */
-      if (cif->abi == FFI_LINUX64)
-	{
-	  if (intarg_count > NUM_GPR_ARG_REGISTERS64)
-	    bytes += (intarg_count - NUM_GPR_ARG_REGISTERS64) * sizeof (long);
-	}
-      else if ((flags & FLAG_ARG_NEEDS_PSAVE) != 0)
+#if _CALL_ELF == 2
+      if ((flags & FLAG_ARG_NEEDS_PSAVE) != 0)
 	bytes += intarg_count * sizeof (long);
+#else
+      if (intarg_count > NUM_GPR_ARG_REGISTERS64)
+	bytes += (intarg_count - NUM_GPR_ARG_REGISTERS64) * sizeof (long);
+#endif
     }
 
   /* The stack space allocated needs to be a multiple of 16 bytes.  */

-- 
Alan Modra
Australia Development Lab, IBM