@@ -2,7 +2,7 @@

 ;

 ; RUN: llc < %s -mtriple=arm-linux-gnueabi > %t

 ; RUN: grep .Lfoo: %t

-; RUN: egrep bl.*\.Lfoo %t

+; RUN: grep -E bl.*\.Lfoo %t

 ; RUN: grep .Lbaz: %t

 ; RUN: grep long.*\.Lbaz %t

@@ -1,5 +1,5 @@

 ; RUN: llc < %s -march=ppc32 | \

-; RUN:   egrep {fn?madd|fn?msub} | count 8

+; RUN:   grep -E {fn?madd|fn?msub} | count 8

 define double @test_FMADD1(double %A, double %B, double %C) {

 	%D = fmul double %A, %B		; <double> [#uses=1]

@@ -1,4 +1,4 @@

-; RUN: llc < %s -march=x86 -mcpu=yonah | egrep {add|lea} | grep 16

+; RUN: llc < %s -march=x86 -mcpu=yonah | grep -E {add|lea} | grep 16

 	%struct.S = type { <2 x i64>, <2 x i64>, <2 x i64>, <2 x i64>,

                            <2 x i64> }

@@ -1,5 +1,5 @@

-; RUN: llc < %s -march=x86 | not egrep {\\\$4294967289|-7}

-; RUN: llc < %s -march=x86 | egrep {\\\$4294967280|-16}

+; RUN: llc < %s -march=x86 | not grep -E {\\\$4294967289|-7}

+; RUN: llc < %s -march=x86 | grep -E {\\\$4294967280|-16}

 ; RUN: llc < %s -march=x86-64 | grep {\\-16}

 define void @t() nounwind {

@@ -1,4 +1,4 @@

-; RUN: llc < %s -march=x86 -mcpu=yonah | not egrep {\(\(xor\|and\)ps\|movd\)}

+; RUN: llc < %s -march=x86 -mcpu=yonah | not grep -E {\(\(xor\|and\)ps\|movd\)}

 ; These operations should be done in integer registers, eliminating constant

 ; pool loads, movd's etc.

@@ -1,5 +1,5 @@

 ; RUN: llc < %s -enable-unsafe-fp-math -march=x86-64 | \

-; RUN:   not egrep {addsd|subsd|xor}

+; RUN:   not grep -E {addsd|subsd|xor}

 declare double @sin(double %f)

@@ -1,7 +1,6 @@

 ; RUN: llvm-as %s -o %t.bc

-; RUN: lli %t.bc > /dev/null

-; ??

-; XFAIL: *

+; RXUN: lli %t.bc > /dev/null

+; FP needs libcalls, which ClamAV has disabled, disable this test

 define double @test(double* %DP, double %Arg) {

 	%D = load double* %DP		; <double> [#uses=1]

@@ -109,6 +109,7 @@ for line in open(os.path.join(config.llvm_obj_root, 'test', 'site.exp')):

 # Add substitutions.

 config.substitutions.append(('%llvmgcc_only', site_exp['llvmgcc']))

+config.substitutions.append(('grep ', site_exp['grep']+" "))

 for sub in ['llvmgcc', 'llvmgxx', 'compile_cxx', 'compile_c',

             'link', 'shlibext', 'ocamlopt', 'llvmdsymutil', 'llvmlibsdir',

             'bugpoint_topts']: