Fix make check on Solaris 10/x86: the default grep is not GNU grep, same for as.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57912 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.config.in b/Makefile.config.in
index 7f2acf2397084ea43f431873251b03b03bf3d289..f2239ef6a0eb041c9ac68a8885240d54ff08761f 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -160,6 +160,7 @@ OCAMLC     := @OCAMLC@
 OCAMLOPT   := @OCAMLOPT@
 OCAMLDEP   := @OCAMLDEP@
 OCAMLDOC   := @OCAMLDOC@
+GAS       := @GAS@
 POD2HTML   := @POD2HTML@
 POD2MAN    := @POD2MAN@
 RUNTEST    := @RUNTEST@

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 3fd4c9b89c32be953e377621f815be6e5b5981aa..d013fed21fd825b805eda94da38381a6f5c1a64a 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -614,6 +614,7 @@ AC_PATH_PROGS(OCAMLC, [ocamlc.opt ocamlc])
 AC_PATH_PROGS(OCAMLOPT, [ocamlopt.opt ocamlopt])
 AC_PATH_PROGS(OCAMLDEP, [ocamldep.opt ocamldep])
 AC_PATH_PROGS(OCAMLDOC, [ocamldoc.opt ocamldoc])
+AC_PATH_PROGS(GAS, [gas as])
 
 dnl Determine if the linker supports the -R option.
 AC_LINK_USE_R

diff --git a/test/Makefile b/test/Makefile
index 391776bb4dfa41395fb6a7f3aeab5bf6da3d5117..676114850a887cdd2f538cd59d6c628d77bb3560 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -110,6 +110,8 @@ site.exp: FORCE
        @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp
        @echo 'set ocamlc "$(OCAMLC) -cc $(CXX) -I $(LibDir)/ocaml"' >> site.tmp
        @echo 'set valgrind "$(VALGRIND)"' >> site.tmp
+       @echo 'set grep "$(GREP)"' >>site.tmp
+       @echo 'set gas "$(GAS)"' >>site.tmp
        @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
        @test ! -f site.exp || \
        sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp

diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index a844152bf23d8861351db46737324d9424a19223..b5d5cffae1e0f7b579b88d181f7196fd65261d7d 100644 (file)
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -49,7 +49,7 @@ proc substitute { line test tmpFile } {
   global srcroot objroot srcdir objdir subdir target_triplet prcontext 
   global llvmgcc llvmgxx llvmgcc_version llvmgccmajvers ocamlc
   global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir
-  global valgrind
+  global valgrind grep gas
   set path [file join $srcdir $subdir]
 
   # Substitute all Tcl variables.
@@ -84,6 +84,11 @@ proc substitute { line test tmpFile } {
   #replace _#MARKER#_ with %
   regsub -all {_#MARKER#_} $new_line % new_line
 
+  #replace grep with GNU grep
+  regsub -all { grep } $new_line " $grep " new_line
+  #replace as with GNU as
+  regsub -all {\| as } $new_line "| $gas " new_line
+
   #valgind related stuff
 # regsub -all {bugpoint } $new_line "$valgrind bugpoint " new_line
   regsub -all {llc } $new_line "$valgrind llc " new_line