binutils-2.25-set-long-long.patch

   1 diff -up binutils-2.25.orig/bfd/configure.ac binutils-2.25/bfd/configure.ac
   2 --- binutils-2.25.orig/bfd/configure.ac 2014-12-24 10:34:45.590491143 +0000
   3 +++ binutils-2.25/bfd/configure.ac      2014-12-24 10:36:12.997981992 +0000
   4 @@ -183,11 +183,13 @@ if test "x${ac_cv_sizeof_long}" = "x8";
   5    BFD_HOST_64BIT_LONG=1
   6    test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
   7    test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
   8 -elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
   9 +fi
  10 +if test "x${ac_cv_sizeof_long_long}" = "x8"; then
  11    BFD_HOST_64BIT_LONG_LONG=1
  12    test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
  13    test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
  14 -  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
  15 +  if test "x${ac_cv_sizeof_void_p}" = "x8" \
  16 +          -a "x${ac_cv_sizeof_long}" != "x8"; then
  17      BFD_HOSTPTR_T="unsigned long long"
  18    fi
  19  fi
  20 diff -up ../binutils-2.20.51.0.7.original/bfd/configure ./bfd/configure
  21 --- a/bfd/configure     2010-04-08 15:23:58.000000000 +0100
  22 +++ b/bfd/configure     2010-04-08 15:24:06.000000000 +0100
  23 @@ -12819,11 +12819,13 @@
  24    BFD_HOST_64BIT_LONG=1
  25    test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
  26    test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
  27 -elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
  28 +fi
  29 +if test "x${ac_cv_sizeof_long_long}" = "x8"; then
  30    BFD_HOST_64BIT_LONG_LONG=1
  31    test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
  32    test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
  33 -  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
  34 +  if test "x${ac_cv_sizeof_void_p}" = "x8" \
  35 +          -a "x${ac_cv_sizeof_long}" != "x8"; then
  36      BFD_HOSTPTR_T="unsigned long long"
  37    fi
  38  fi