--- configure.orig	Sun Oct 16 15:36:00 2005
+++ configure	Wed Apr 12 23:30:52 2006
@@ -21457,6 +21457,9 @@
      case "$host" in
       i386-*-freebsd*)
         ARCH_DEFINES="-DARCH_X86"
+        if test "x$benchmark" = xyes -a -n "`grep '^CPU:.*[56]86-class' /var/run/dmesg.boot`"; then
+          XF_CFLAGS="$XF_CFLAGS -DBENCHMARK"
+        fi
       ;;
       i386-*-openbsd* | i386-*-netbsd*)
         ARCH_DEFINES="-DARCH_X86"
@@ -21527,9 +21530,9 @@
 
   case "$host" in
     i386-*-freebsd*)
-      SSE_RES=`grep 'Features=.*<,SSE>,' /var/run/dmesg.boot`
-      SSE2_RES=`grep 'Features=.*<,SSE2>,' /var/run/dmesg.boot`
-      MMX_RES=`grep 'Features=.*<,MMX>,' /var/run/dmesg.boot`
+      SSE_RES=`grep 'Features=.*[<,]SSE[>,]' /var/run/dmesg.boot`
+      SSE2_RES=`grep 'Features=.*[<,]SSE2[>,]' /var/run/dmesg.boot`
+      MMX_RES=`grep 'Features=.*[<,]MMX[>,]' /var/run/dmesg.boot`
     ;;
     i386-*-openbsd* | i386-*-netbsd*)
       autodetect=no