bryanhundven@2909: diff --git a/configure b/configure
bryanhundven@2909: index e5e0184..85da2bc 100755
bryanhundven@2909: --- a/configure
bryanhundven@2909: +++ b/configure
bryanhundven@2909: @@ -7567,40 +7567,6 @@ _ACEOF
bryanhundven@2909:  fi
bryanhundven@2909:  fi
bryanhundven@2909:  
bryanhundven@2909: -{ $as_echo "$as_me:$LINENO: checking for __builtin_expect" >&5
bryanhundven@2909: -$as_echo_n "checking for __builtin_expect... " >&6; }
bryanhundven@2909: -if test "${libc_cv_gcc_builtin_expect+set}" = set; then
bryanhundven@2909: -  $as_echo_n "(cached) " >&6
bryanhundven@2909: -else
bryanhundven@2909: -  cat > conftest.c <<EOF
bryanhundven@2909: -#line $LINENO "configure"
bryanhundven@2909: -int foo (int a)
bryanhundven@2909: -{
bryanhundven@2909: -  a = __builtin_expect (a, 10);
bryanhundven@2909: -  return a == 10 ? 0 : 1;
bryanhundven@2909: -}
bryanhundven@2909: -EOF
bryanhundven@2909: -if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostdlib -nostartfiles
bryanhundven@2909: -			    -o conftest conftest.c -lgcc >&5'
bryanhundven@2909: -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
bryanhundven@2909: -  (eval $ac_try) 2>&5
bryanhundven@2909: -  ac_status=$?
bryanhundven@2909: -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
bryanhundven@2909: -  (exit $ac_status); }; }; then
bryanhundven@2909: -  libc_cv_gcc_builtin_expect=yes
bryanhundven@2909: -else
bryanhundven@2909: -  libc_cv_gcc_builtin_expect=no
bryanhundven@2909: -fi
bryanhundven@2909: -rm -f conftest*
bryanhundven@2909: -fi
bryanhundven@2909: -{ $as_echo "$as_me:$LINENO: result: $libc_cv_gcc_builtin_expect" >&5
bryanhundven@2909: -$as_echo "$libc_cv_gcc_builtin_expect" >&6; }
bryanhundven@2909: -if test "$libc_cv_gcc_builtin_expect" = no; then
bryanhundven@2909: -  { { $as_echo "$as_me:$LINENO: error: support for __builtin_expect needed" >&5
bryanhundven@2909: -$as_echo "$as_me: error: support for __builtin_expect needed" >&2;}
bryanhundven@2909: -   { (exit 1); exit 1; }; }
bryanhundven@2909: -fi
bryanhundven@2909: -
bryanhundven@2909:  { $as_echo "$as_me:$LINENO: checking for __builtin_memset" >&5
bryanhundven@2909:  $as_echo_n "checking for __builtin_memset... " >&6; }
bryanhundven@2909:  if test "${libc_cv_gcc_builtin_memset+set}" = set; then
bryanhundven@2909: diff --git a/configure.in b/configure.in
bryanhundven@2909: index 4655c8a..596443d 100644
bryanhundven@2909: --- a/configure.in
bryanhundven@2909: +++ b/configure.in
bryanhundven@2909: @@ -2134,28 +2134,6 @@ if test "$libc_cv_c_asmcr0_bug" != 'no'; then
bryanhundven@2909:  fi
bryanhundven@2909:  fi
bryanhundven@2909:  
bryanhundven@2909: -dnl Check whether compiler understands __builtin_expect.
bryanhundven@2909: -AC_CACHE_CHECK(for __builtin_expect, libc_cv_gcc_builtin_expect,
bryanhundven@2909: -[cat > conftest.c <<EOF
bryanhundven@2909: -#line $LINENO "configure"
bryanhundven@2909: -int foo (int a)
bryanhundven@2909: -{
bryanhundven@2909: -  a = __builtin_expect (a, 10);
bryanhundven@2909: -  return a == 10 ? 0 : 1;
bryanhundven@2909: -}
bryanhundven@2909: -EOF
bryanhundven@2909: -dnl No \ in command here because it ends up inside ''.
bryanhundven@2909: -if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostdlib -nostartfiles
bryanhundven@2909: -			    -o conftest conftest.c -lgcc >&AS_MESSAGE_LOG_FD]); then
bryanhundven@2909: -  libc_cv_gcc_builtin_expect=yes
bryanhundven@2909: -else
bryanhundven@2909: -  libc_cv_gcc_builtin_expect=no
bryanhundven@2909: -fi
bryanhundven@2909: -rm -f conftest*])
bryanhundven@2909: -if test "$libc_cv_gcc_builtin_expect" = no; then
bryanhundven@2909: -  AC_MSG_ERROR([support for __builtin_expect needed])
bryanhundven@2909: -fi
bryanhundven@2909: -
bryanhundven@2909:  AC_CACHE_CHECK(for __builtin_memset, libc_cv_gcc_builtin_memset, [dnl
bryanhundven@2909:  cat > conftest.c <<\EOF
bryanhundven@2909:  void zero (void *x)