4140ce
--- bfd/configure.in-orig	2008-09-22 00:19:20.000000000 +0200
4140ce
+++ bfd/configure.in	2008-09-22 00:43:15.000000000 +0200
4140ce
@@ -149,11 +149,13 @@ if test "x${ac_cv_sizeof_long}" = "x8"; 
4140ce
   BFD_HOST_64BIT_LONG=1
4140ce
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
4140ce
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
4140ce
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
4140ce
+fi
4140ce
+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
4140ce
   BFD_HOST_64BIT_LONG_LONG=1
4140ce
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
4140ce
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
4140ce
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
4140ce
+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
4140ce
+          -a "x${ac_cv_sizeof_long}" != "x8"; then
4140ce
     BFD_HOSTPTR_T="unsigned long long"
4140ce
   fi
4140ce
 fi
fe03d6
--- ../binutils-2.19.50.0.1.orig/bfd/configure	2008-11-21 16:45:02.000000000 +0000
fe03d6
+++ bfd/configure	2008-11-21 17:04:55.000000000 +0000
fe03d6
@@ -13844,11 +13868,13 @@ if test "x${ac_cv_sizeof_long}" = "x8"; 
4140ce
   BFD_HOST_64BIT_LONG=1
4140ce
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
4140ce
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
4140ce
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
4140ce
+fi
4140ce
+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
4140ce
   BFD_HOST_64BIT_LONG_LONG=1
4140ce
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
4140ce
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
4140ce
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
4140ce
+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
4140ce
+          -a "x${ac_cv_sizeof_long}" != "x8"; then
4140ce
     BFD_HOSTPTR_T="unsigned long long"
4140ce
   fi
4140ce
 fi