2055b15
diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure bfd/configure
2055b15
--- ../binutils-2.20.51.0.2.orig/bfd/configure	2009-10-12 11:45:05.000000000 +0100
2055b15
+++ bfd/configure	2009-10-12 11:45:13.000000000 +0100
2055b15
@@ -12694,11 +12694,13 @@ if test "x${ac_cv_sizeof_long}" = "x8"; 
4140cef
   BFD_HOST_64BIT_LONG=1
4140cef
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
4140cef
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
4140cef
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
4140cef
+fi
4140cef
+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
4140cef
   BFD_HOST_64BIT_LONG_LONG=1
4140cef
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
4140cef
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
4140cef
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
4140cef
+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
4140cef
+          -a "x${ac_cv_sizeof_long}" != "x8"; then
4140cef
     BFD_HOSTPTR_T="unsigned long long"
4140cef
   fi
4140cef
 fi
2055b15
diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure.in bfd/configure.in
2055b15
--- ../binutils-2.20.51.0.2.orig/bfd/configure.in	2009-10-12 11:45:05.000000000 +0100
2055b15
+++ bfd/configure.in	2009-10-12 11:45:13.000000000 +0100
11c397e
@@ -172,11 +172,13 @@ if test "x${ac_cv_sizeof_long}" = "x8"; 
4140cef
   BFD_HOST_64BIT_LONG=1
4140cef
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long"
4140cef
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long"
4140cef
-elif test "x${ac_cv_sizeof_long_long}" = "x8"; then
4140cef
+fi
4140cef
+if test "x${ac_cv_sizeof_long_long}" = "x8"; then
4140cef
   BFD_HOST_64BIT_LONG_LONG=1
4140cef
   test -n "${HOST_64BIT_TYPE}" || HOST_64BIT_TYPE="long long"
4140cef
   test -n "${HOST_U_64BIT_TYPE}" || HOST_U_64BIT_TYPE="unsigned long long"
4140cef
-  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
4140cef
+  if test "x${ac_cv_sizeof_void_p}" = "x8" \
4140cef
+          -a "x${ac_cv_sizeof_long}" != "x8"; then
4140cef
     BFD_HOSTPTR_T="unsigned long long"
4140cef
   fi
4140cef
 fi