diff -up binutils-2.25.orig/bfd/configure.ac binutils-2.25/bfd/configure.ac

--- binutils-2.25.orig/bfd/configure.ac	2014-12-24 10:34:45.590491143 +0000

+++ binutils-2.25/bfd/configure.ac	2014-12-24 10:36:12.997981992 +0000

@@ -183,11 +183,13 @@ if test "x${ac_cv_sizeof_long}" = "x8";

   BFD_HOST_64BIT_LONG=1

   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"

   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"

-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then

+fi

+if test "x${ac_cv_sizeof_long_long}" = "x8"; then

   BFD_HOST_64BIT_LONG_LONG=1

   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"

   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"

-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then

+  if test "x${ac_cv_sizeof_void_p}" = "x8" \

+          -a "x${ac_cv_sizeof_long}" != "x8"; then

     BFD_HOSTPTR_T="unsigned long long"

   fi

 fi

diff -up ../binutils-2.20.51.0.7.original/bfd/configure ./bfd/configure

--- a/bfd/configure	2010-04-08 15:23:58.000000000 +0100

+++ b/bfd/configure	2010-04-08 15:24:06.000000000 +0100

@@ -12819,11 +12819,13 @@

   BFD_HOST_64BIT_LONG=1

   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"

   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"

-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then

+fi

+if test "x${ac_cv_sizeof_long_long}" = "x8"; then

   BFD_HOST_64BIT_LONG_LONG=1

   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"

   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"

-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then

+  if test "x${ac_cv_sizeof_void_p}" = "x8" \

+          -a "x${ac_cv_sizeof_long}" != "x8"; then

     BFD_HOSTPTR_T="unsigned long long"

   fi

 fi