--- bfd/configure.in-orig 2008-09-22 00:19:20.000000000 +0200 +++ bfd/configure.in 2008-09-22 00:43:15.000000000 +0200 @@ -149,11 +149,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 --- ../binutils-2.19.50.0.1.orig/bfd/configure 2008-11-21 16:45:02.000000000 +0000 +++ bfd/configure 2008-11-21 17:04:55.000000000 +0000 @@ -13844,11 +13868,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