Index: llvm-3.5.git/utils/llvmdo
===================================================================
--- llvm-3.5.git.orig/utils/llvmdo
+++ llvm-3.5.git/utils/llvmdo
@@ -166,12 +166,6 @@ files_to_ignore="\
 
 if test -d "$TOPDIR" ; then
   cd $TOPDIR
-  # Have to use the right "find" on a per-platform basis. Most platforms have
-  # Gnu find as "find", but Solaris does not.
-  case `uname -s` in
-    SunOS) find_prog=gfind ;;
-    *) find_prog=find ;;
-  esac
   # Turn off file name generation (globbing) so that substitution of the
   # variables doesn't cause the shell to create lists of file names
   set -f
Index: llvm-3.5.git/utils/llvmgrep
===================================================================
--- llvm-3.5.git.orig/utils/llvmgrep
+++ llvm-3.5.git/utils/llvmgrep
@@ -28,7 +28,7 @@ fi
 if test -d "$TOPDIR" ; then
   cd $TOPDIR
   case `uname -s` in
-    SunOS) grep_cmd="ggrep -H -n" ;;
+    SunOS) grep_cmd="egrep -H -n" ;;
     Linux|Darwin) grep_cmd="egrep -H -n" ;;
     *) grep_cmd="egrep -l -n" ;;
   esac