# HG changeset patch

# Parent 16cf73a02802e3b4a77ccd77794346441638e2a7

# User Ulrich Weigand <uweigand@de.ibm.com>

Bug 976648 - powerpc64le-linux support - libffi backport

diff --git a/js/src/ctypes/libffi/aclocal.m4 b/js/src/ctypes/libffi/aclocal.m4

--- a/js/src/ctypes/libffi/aclocal.m4

+++ b/js/src/ctypes/libffi/aclocal.m4

@@ -1277,31 +1277,34 @@ ia64-*-hpux*)

 	  LD="${LD-ld} -64"

 	  ;;

       esac

     fi

   fi

   rm -rf conftest*

   ;;

-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \

+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \

 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)

   # Find out which ABI we are using.

   echo 'int i;' > conftest.$ac_ext

   if AC_TRY_EVAL(ac_compile); then

     case `/usr/bin/file conftest.o` in

       *32-bit*)

 	case $host in

 	  x86_64-*kfreebsd*-gnu)

 	    LD="${LD-ld} -m elf_i386_fbsd"

 	    ;;

 	  x86_64-*linux*)

 	    LD="${LD-ld} -m elf_i386"

 	    ;;

-	  ppc64-*linux*|powerpc64-*linux*)

+	  powerpc64le-*linux*)

+	    LD="${LD-ld} -m elf32lppclinux"

+	    ;;

+	  powerpc64-*linux*)

 	    LD="${LD-ld} -m elf32ppclinux"

 	    ;;

 	  s390x-*linux*)

 	    LD="${LD-ld} -m elf_s390"

 	    ;;

 	  sparc64-*linux*)

 	    LD="${LD-ld} -m elf32_sparc"

 	    ;;

@@ -1310,17 +1313,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*

       *64-bit*)

 	case $host in

 	  x86_64-*kfreebsd*-gnu)

 	    LD="${LD-ld} -m elf_x86_64_fbsd"

 	    ;;

 	  x86_64-*linux*)

 	    LD="${LD-ld} -m elf_x86_64"

 	    ;;

-	  ppc*-*linux*|powerpc*-*linux*)

+	  powerpcle-*linux*)

+	    LD="${LD-ld} -m elf64lppc"

+	    ;;

+	  powerpc-*linux*)

 	    LD="${LD-ld} -m elf64ppc"

 	    ;;

 	  s390*-*linux*|s390*-*tpf*)

 	    LD="${LD-ld} -m elf64_s390"

 	    ;;

 	  sparc*-*linux*)

 	    LD="${LD-ld} -m elf64_sparc"

 	    ;;

diff --git a/js/src/ctypes/libffi/configure b/js/src/ctypes/libffi/configure

--- a/js/src/ctypes/libffi/configure

+++ b/js/src/ctypes/libffi/configure

@@ -6293,17 +6293,17 @@ ia64-*-hpux*)

 	  LD="${LD-ld} -64"

 	  ;;

       esac

     fi

   fi

   rm -rf conftest*

   ;;

-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \

+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \

 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)

   # Find out which ABI we are using.

   echo 'int i;' > conftest.$ac_ext

   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

   test $ac_status = 0; }; then

@@ -6311,17 +6311,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*

       *32-bit*)

 	case $host in

 	  x86_64-*kfreebsd*-gnu)

 	    LD="${LD-ld} -m elf_i386_fbsd"

 	    ;;

 	  x86_64-*linux*)

 	    LD="${LD-ld} -m elf_i386"

 	    ;;

-	  ppc64-*linux*|powerpc64-*linux*)

+	  powerpc64le-*linux*)

+	    LD="${LD-ld} -m elf32lppclinux"

+	    ;;

+	  powerpc64-*linux*)

 	    LD="${LD-ld} -m elf32ppclinux"

 	    ;;

 	  s390x-*linux*)

 	    LD="${LD-ld} -m elf_s390"

 	    ;;

 	  sparc64-*linux*)

 	    LD="${LD-ld} -m elf32_sparc"

 	    ;;

@@ -6330,17 +6333,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*

       *64-bit*)

 	case $host in

 	  x86_64-*kfreebsd*-gnu)

 	    LD="${LD-ld} -m elf_x86_64_fbsd"

 	    ;;

 	  x86_64-*linux*)

 	    LD="${LD-ld} -m elf_x86_64"

 	    ;;

-	  ppc*-*linux*|powerpc*-*linux*)

+	  powerpcle-*linux*)

+	    LD="${LD-ld} -m elf64lppc"

+	    ;;

+	  powerpc-*linux*)

 	    LD="${LD-ld} -m elf64ppc"

 	    ;;

 	  s390*-*linux*|s390*-*tpf*)

 	    LD="${LD-ld} -m elf64_s390"

 	    ;;

 	  sparc*-*linux*)

 	    LD="${LD-ld} -m elf64_sparc"

 	    ;;

diff --git a/js/src/ctypes/libffi/m4/libtool.m4 b/js/src/ctypes/libffi/m4/libtool.m4

--- a/js/src/ctypes/libffi/m4/libtool.m4

+++ b/js/src/ctypes/libffi/m4/libtool.m4

@@ -1262,31 +1262,34 @@ ia64-*-hpux*)

 	  LD="${LD-ld} -64"

 	  ;;

       esac

     fi

   fi

   rm -rf conftest*

   ;;

-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \

+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \

 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)

   # Find out which ABI we are using.

   echo 'int i;' > conftest.$ac_ext

   if AC_TRY_EVAL(ac_compile); then

     case `/usr/bin/file conftest.o` in

       *32-bit*)

 	case $host in

 	  x86_64-*kfreebsd*-gnu)

 	    LD="${LD-ld} -m elf_i386_fbsd"

 	    ;;

 	  x86_64-*linux*)

 	    LD="${LD-ld} -m elf_i386"

 	    ;;

-	  ppc64-*linux*|powerpc64-*linux*)

+	  powerpc64le-*linux*)

+	    LD="${LD-ld} -m elf32lppclinux"

+	    ;;

+	  powerpc64-*linux*)

 	    LD="${LD-ld} -m elf32ppclinux"

 	    ;;

 	  s390x-*linux*)

 	    LD="${LD-ld} -m elf_s390"

 	    ;;

 	  sparc64-*linux*)

 	    LD="${LD-ld} -m elf32_sparc"

 	    ;;

@@ -1295,17 +1298,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*

       *64-bit*)

 	case $host in

 	  x86_64-*kfreebsd*-gnu)

 	    LD="${LD-ld} -m elf_x86_64_fbsd"

 	    ;;

 	  x86_64-*linux*)

 	    LD="${LD-ld} -m elf_x86_64"

 	    ;;

-	  ppc*-*linux*|powerpc*-*linux*)

+	  powerpcle-*linux*)

+	    LD="${LD-ld} -m elf64lppc"

+	    ;;

+	  powerpc-*linux*)

 	    LD="${LD-ld} -m elf64ppc"

 	    ;;

 	  s390*-*linux*|s390*-*tpf*)

 	    LD="${LD-ld} -m elf64_s390"

 	    ;;

 	  sparc*-*linux*)

 	    LD="${LD-ld} -m elf64_sparc"

 	    ;;

diff --git a/js/src/ctypes/libffi/src/powerpc/ffi.c b/js/src/ctypes/libffi/src/powerpc/ffi.c

--- a/js/src/ctypes/libffi/src/powerpc/ffi.c

+++ b/js/src/ctypes/libffi/src/powerpc/ffi.c

@@ -1,12 +1,14 @@

 /* -----------------------------------------------------------------------

-   ffi.c - Copyright (c) 1998 Geoffrey Keating

-   Copyright (C) 2007, 2008 Free Software Foundation, Inc

-   Copyright (C) 2008 Red Hat, Inc

+   ffi.c - Copyright (C) 2011 Anthony Green

+           Copyright (C) 2011 Kyle Moffett

+           Copyright (C) 2008 Red Hat, Inc

+           Copyright (C) 2007, 2008 Free Software Foundation, Inc

+	   Copyright (c) 1998 Geoffrey Keating

    PowerPC Foreign Function Interface

    Permission is hereby granted, free of charge, to any person obtaining

    a copy of this software and associated documentation files (the

    ``Software''), to deal in the Software without restriction, including

    without limitation the rights to use, copy, modify, merge, publish,

    distribute, sublicense, and/or sell copies of the Software, and to

@@ -34,42 +36,39 @@

 extern void ffi_closure_SYSV (void);

 extern void FFI_HIDDEN ffi_closure_LINUX64 (void);

 enum {

   /* The assembly depends on these exact flags.  */

   FLAG_RETURNS_SMST	= 1 << (31-31), /* Used for FFI_SYSV small structs.  */

   FLAG_RETURNS_NOTHING  = 1 << (31-30), /* These go in cr7 */

+#ifndef __NO_FPRS__

   FLAG_RETURNS_FP       = 1 << (31-29),

+#endif

   FLAG_RETURNS_64BITS   = 1 << (31-28),

   FLAG_RETURNS_128BITS  = 1 << (31-27), /* cr6  */

-  FLAG_SYSV_SMST_R4     = 1 << (31-26), /* use r4 for FFI_SYSV 8 byte

-					   structs.  */

-  FLAG_SYSV_SMST_R3     = 1 << (31-25), /* use r3 for FFI_SYSV 4 byte

-					   structs.  */

-  /* Bits (31-24) through (31-19) store shift value for SMST */

   FLAG_ARG_NEEDS_COPY   = 1 << (31- 7),

+  FLAG_ARG_NEEDS_PSAVE  = FLAG_ARG_NEEDS_COPY, /* Used by ELFv2 */

+#ifndef __NO_FPRS__

   FLAG_FP_ARGUMENTS     = 1 << (31- 6), /* cr1.eq; specified by ABI */

+#endif

   FLAG_4_GPR_ARGUMENTS  = 1 << (31- 5),

   FLAG_RETVAL_REFERENCE = 1 << (31- 4)

 };

 /* About the SYSV ABI.  */

-unsigned int NUM_GPR_ARG_REGISTERS = 8;

+#define ASM_NEEDS_REGISTERS 4

+#define NUM_GPR_ARG_REGISTERS 8

 #ifndef __NO_FPRS__

-unsigned int NUM_FPR_ARG_REGISTERS = 8;

-#else

-unsigned int NUM_FPR_ARG_REGISTERS = 0;

+# define NUM_FPR_ARG_REGISTERS 8

 #endif

-enum { ASM_NEEDS_REGISTERS = 4 };

-

 /* ffi_prep_args_SYSV is called by the assembly routine once stack space

    has been allocated for the function's arguments.

    The stack layout we want looks like this:

    |   Return address from ffi_call_SYSV 4bytes	|	higher addresses

    |--------------------------------------------|

    |   Previous backchain pointer	4	|       stack pointer here

@@ -108,100 +107,119 @@ ffi_prep_args_SYSV (extended_cif *ecif, 

   /* 'stacktop' points at the previous backchain pointer.  */

   valp stacktop;

   /* 'gpr_base' points at the space for gpr3, and grows upwards as

      we use GPR registers.  */

   valp gpr_base;

   int intarg_count;

+#ifndef __NO_FPRS__

   /* 'fpr_base' points at the space for fpr1, and grows upwards as

      we use FPR registers.  */

   valp fpr_base;

   int fparg_count;

+#endif

   /* 'copy_space' grows down as we put structures in it.  It should

      stay 16-byte aligned.  */

   valp copy_space;

   /* 'next_arg' grows up as we put parameters in it.  */

   valp next_arg;

-  int i, ii MAYBE_UNUSED;

+  int i;

   ffi_type **ptr;

+#ifndef __NO_FPRS__

   double double_tmp;

+#endif

   union {

     void **v;

     char **c;

     signed char **sc;

     unsigned char **uc;

     signed short **ss;

     unsigned short **us;

     unsigned int **ui;

     long long **ll;

     float **f;

     double **d;

   } p_argv;

   size_t struct_copy_size;

   unsigned gprvalue;

-  if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT)

-    NUM_FPR_ARG_REGISTERS = 0;

-

   stacktop.c = (char *) stack + bytes;

   gpr_base.u = stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS;

   intarg_count = 0;

+#ifndef __NO_FPRS__

   fpr_base.d = gpr_base.d - NUM_FPR_ARG_REGISTERS;

   fparg_count = 0;

   copy_space.c = ((flags & FLAG_FP_ARGUMENTS) ? fpr_base.c : gpr_base.c);

+#else

+  copy_space.c = gpr_base.c;

+#endif

   next_arg.u = stack + 2;

   /* Check that everything starts aligned properly.  */

-  FFI_ASSERT (((unsigned) (char *) stack & 0xF) == 0);

-  FFI_ASSERT (((unsigned) copy_space.c & 0xF) == 0);

-  FFI_ASSERT (((unsigned) stacktop.c & 0xF) == 0);

+  FFI_ASSERT (((unsigned long) (char *) stack & 0xF) == 0);

+  FFI_ASSERT (((unsigned long) copy_space.c & 0xF) == 0);

+  FFI_ASSERT (((unsigned long) stacktop.c & 0xF) == 0);

   FFI_ASSERT ((bytes & 0xF) == 0);

   FFI_ASSERT (copy_space.c >= next_arg.c);

   /* Deal with return values that are actually pass-by-reference.  */

   if (flags & FLAG_RETVAL_REFERENCE)

     {

       *gpr_base.u++ = (unsigned long) (char *) ecif->rvalue;

       intarg_count++;

     }

   /* Now for the arguments.  */

   p_argv.v = ecif->avalue;

   for (ptr = ecif->cif->arg_types, i = ecif->cif->nargs;

        i > 0;

        i--, ptr++, p_argv.v++)

     {

-      switch ((*ptr)->type)

-	{

+      unsigned short typenum = (*ptr)->type;

+

+      /* We may need to handle some values depending on ABI */

+      if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT) {

+		if (typenum == FFI_TYPE_FLOAT)

+			typenum = FFI_TYPE_UINT32;

+		if (typenum == FFI_TYPE_DOUBLE)

+			typenum = FFI_TYPE_UINT64;

+		if (typenum == FFI_TYPE_LONGDOUBLE)

+			typenum = FFI_TYPE_UINT128;

+      } else if (ecif->cif->abi != FFI_LINUX) {

+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE

+		if (typenum == FFI_TYPE_LONGDOUBLE)

+			typenum = FFI_TYPE_STRUCT;

+#endif

+      }

+

+      /* Now test the translated value */

+      switch (typenum) {

+#ifndef __NO_FPRS__

 	case FFI_TYPE_FLOAT:

 	  /* With FFI_LINUX_SOFT_FLOAT floats are handled like UINT32.  */

-	  if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT)

-	    goto soft_float_prep;

 	  double_tmp = **p_argv.f;

 	  if (fparg_count >= NUM_FPR_ARG_REGISTERS)

 	    {

 	      *next_arg.f = (float) double_tmp;

 	      next_arg.u += 1;

 	      intarg_count++;

 	    }

 	  else

 	    *fpr_base.d++ = double_tmp;

 	  fparg_count++;

 	  FFI_ASSERT (flags & FLAG_FP_ARGUMENTS);

 	  break;

 	case FFI_TYPE_DOUBLE:

 	  /* With FFI_LINUX_SOFT_FLOAT doubles are handled like UINT64.  */

-	  if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT)

-	    goto soft_double_prep;

 	  double_tmp = **p_argv.d;

 	  if (fparg_count >= NUM_FPR_ARG_REGISTERS)

 	    {

 	      if (intarg_count >= NUM_GPR_ARG_REGISTERS

 		  && intarg_count % 2 != 0)

 		{

 		  intarg_count++;

@@ -213,53 +231,16 @@ ffi_prep_args_SYSV (extended_cif *ecif, 

 	  else

 	    *fpr_base.d++ = double_tmp;

 	  fparg_count++;

 	  FFI_ASSERT (flags & FLAG_FP_ARGUMENTS);

 	  break;

 #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE

 	case FFI_TYPE_LONGDOUBLE:

-	  if ((ecif->cif->abi != FFI_LINUX)

-		&& (ecif->cif->abi != FFI_LINUX_SOFT_FLOAT))

-	    goto do_struct;

-	  /* The soft float ABI for long doubles works like this,

-	     a long double is passed in four consecutive gprs if available.

-	     A maximum of 2 long doubles can be passed in gprs.

-	     If we do not have 4 gprs left, the long double is passed on the

-	     stack, 4-byte aligned.  */

-	  if (ecif->cif->abi == FFI_LINUX_SOFT_FLOAT)

-	    {

-	      unsigned int int_tmp = (*p_argv.ui)[0];

-	      if (intarg_count >= NUM_GPR_ARG_REGISTERS - 3)

-		{

-		  if (intarg_count < NUM_GPR_ARG_REGISTERS)

-		    intarg_count += NUM_GPR_ARG_REGISTERS - intarg_count;

-		  *next_arg.u = int_tmp;

-		  next_arg.u++;

-		  for (ii = 1; ii < 4; ii++)

-		    {

-		      int_tmp = (*p_argv.ui)[ii];

-		      *next_arg.u = int_tmp;

-		      next_arg.u++;

-		    }

-		}

-	      else

-		{

-		  *gpr_base.u++ = int_tmp;

-		  for (ii = 1; ii < 4; ii++)

-		    {

-		      int_tmp = (*p_argv.ui)[ii];

-		      *gpr_base.u++ = int_tmp;

-		    }

-		}

-	      intarg_count +=4;

-	    }

-	  else

-	    {

 	      double_tmp = (*p_argv.d)[0];

 	      if (fparg_count >= NUM_FPR_ARG_REGISTERS - 1)

 		{

 		  if (intarg_count >= NUM_GPR_ARG_REGISTERS

 		      && intarg_count % 2 != 0)

 		    {

 		      intarg_count++;

@@ -275,23 +256,50 @@ ffi_prep_args_SYSV (extended_cif *ecif, 

 		{

 		  *fpr_base.d++ = double_tmp;

 		  double_tmp = (*p_argv.d)[1];

 		  *fpr_base.d++ = double_tmp;

 		}

 	      fparg_count += 2;

 	      FFI_ASSERT (flags & FLAG_FP_ARGUMENTS);

-	    }

 	  break;

 #endif

+#endif /* have FPRs */

+

+	/*

+	 * The soft float ABI for long doubles works like this, a long double

+	 * is passed in four consecutive GPRs if available.  A maximum of 2

+	 * long doubles can be passed in gprs.  If we do not have 4 GPRs

+	 * left, the long double is passed on the stack, 4-byte aligned.

+	 */

+	case FFI_TYPE_UINT128: {

+		unsigned int int_tmp = (*p_argv.ui)[0];

+		unsigned int ii;

+		if (intarg_count >= NUM_GPR_ARG_REGISTERS - 3) {

+			if (intarg_count < NUM_GPR_ARG_REGISTERS)

+				intarg_count += NUM_GPR_ARG_REGISTERS - intarg_count;

+			*(next_arg.u++) = int_tmp;

+			for (ii = 1; ii < 4; ii++) {

+				int_tmp = (*p_argv.ui)[ii];

+				*(next_arg.u++) = int_tmp;

+			}

+		} else {

+			*(gpr_base.u++) = int_tmp;

+			for (ii = 1; ii < 4; ii++) {

+				int_tmp = (*p_argv.ui)[ii];

+				*(gpr_base.u++) = int_tmp;

+			}

+		}

+		intarg_count += 4;

+		break;

+	}

 	case FFI_TYPE_UINT64:

 	case FFI_TYPE_SINT64:

-	soft_double_prep:

 	  if (intarg_count == NUM_GPR_ARG_REGISTERS-1)

 	    intarg_count++;

 	  if (intarg_count >= NUM_GPR_ARG_REGISTERS)

 	    {

 	      if (intarg_count % 2 != 0)

 		{

 		  intarg_count++;

 		  next_arg.u++;

@@ -314,19 +322,16 @@ ffi_prep_args_SYSV (extended_cif *ecif, 

 		  gpr_base.u++;

 		}

 	      *gpr_base.ll++ = **p_argv.ll;

 	    }

 	  intarg_count += 2;

 	  break;

 	case FFI_TYPE_STRUCT:

-#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE

-	do_struct:

-#endif

 	  struct_copy_size = ((*ptr)->size + 15) & ~0xF;

 	  copy_space.c -= struct_copy_size;

 	  memcpy (copy_space.c, *p_argv.c, (*ptr)->size);

 	  gprvalue = (unsigned long) copy_space.c;

 	  FFI_ASSERT (copy_space.c > next_arg.c);

 	  FFI_ASSERT (flags & FLAG_ARG_NEEDS_COPY);

@@ -344,45 +349,91 @@ ffi_prep_args_SYSV (extended_cif *ecif,