Merge from mainline for PR2886.

llvm-svn: 58033

9 files changed, 15 insertions, 15 deletions

diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
index f6167b72b22e..507a9d9cb452 100644
--- a/llvm/autoconf/configure.ac
+++ b/llvm/autoconf/configure.ac
@@ -610,10 +610,10 @@ AC_PATH_PROG(POD2MAN, [pod2man])
 AC_PATH_PROG(RUNTEST, [runtest])
 DJ_AC_PATH_TCLSH
 AC_PATH_PROG(ZIP, [zip])
-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(OCAMLC, [ocamlc])
+AC_PATH_PROGS(OCAMLOPT, [ocamlopt])
+AC_PATH_PROGS(OCAMLDEP, [ocamldep])
+AC_PATH_PROGS(OCAMLDOC, [ocamldoc])
 
 dnl Determine if the linker supports the -R option.
 AC_LINK_USE_R
diff --git a/llvm/configure b/llvm/configure
index 5fa3ad4080ab..38574235fb1a 100755
--- a/llvm/configure
+++ b/llvm/configure
@@ -8139,7 +8139,7 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-for ac_prog in ocamlc.opt ocamlc
+for ac_prog in ocamlc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -8184,7 +8184,7 @@ fi
   test -n "$OCAMLC" && break
 done
 
-for ac_prog in ocamlopt.opt ocamlopt
+for ac_prog in ocamlopt
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -8229,7 +8229,7 @@ fi
   test -n "$OCAMLOPT" && break
 done
 
-for ac_prog in ocamldep.opt ocamldep
+for ac_prog in ocamldep
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -8274,7 +8274,7 @@ fi
   test -n "$OCAMLDEP" && break
 done
 
-for ac_prog in ocamldoc.opt ocamldoc
+for ac_prog in ocamldoc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
diff --git a/llvm/test/Bindings/Ocaml/analysis.ml b/llvm/test/Bindings/Ocaml/analysis.ml
index 9c61295d455c..5a6fde8da24d 100644
--- a/llvm/test/Bindings/Ocaml/analysis.ml
+++ b/llvm/test/Bindings/Ocaml/analysis.ml
@@ -1,4 +1,4 @@
-(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma %s -o %t
+(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma %s -o %t 2> /dev/null
  * RUN: ./%t %t.bc
  *)
 
diff --git a/llvm/test/Bindings/Ocaml/bitreader.ml b/llvm/test/Bindings/Ocaml/bitreader.ml
index 59f036fe2dfe..776228fc1648 100644
--- a/llvm/test/Bindings/Ocaml/bitreader.ml
+++ b/llvm/test/Bindings/Ocaml/bitreader.ml
@@ -1,4 +1,4 @@
-(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitreader.cma llvm_bitwriter.cma %s -o %t
+(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitreader.cma llvm_bitwriter.cma %s -o %t 2> /dev/null
  * RUN: ./%t %t.bc
  * RUN: llvm-dis < %t.bc | grep caml_int_ty
  *)
diff --git a/llvm/test/Bindings/Ocaml/bitwriter.ml b/llvm/test/Bindings/Ocaml/bitwriter.ml
index 93e8d00cea0e..ec9dbc832997 100644
--- a/llvm/test/Bindings/Ocaml/bitwriter.ml
+++ b/llvm/test/Bindings/Ocaml/bitwriter.ml
@@ -1,4 +1,4 @@
-(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitwriter.cma %s -o %t
+(* RUN: %ocamlc -warn-error A llvm.cma llvm_bitwriter.cma %s -o %t 2> /dev/null
  * RUN: ./%t %t.bc
  * RUN: llvm-dis < %t.bc | grep caml_int_ty
  *)
diff --git a/llvm/test/Bindings/Ocaml/executionengine.ml b/llvm/test/Bindings/Ocaml/executionengine.ml
index d238076a0654..726a700f0ce3 100644
--- a/llvm/test/Bindings/Ocaml/executionengine.ml
+++ b/llvm/test/Bindings/Ocaml/executionengine.ml
@@ -1,4 +1,4 @@
-(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma llvm_executionengine.cma %s -o %t
+(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma llvm_executionengine.cma %s -o %t 2> /dev/null
  * RUN: ./%t %t.bc
  *)
 
diff --git a/llvm/test/Bindings/Ocaml/scalar_opts.ml b/llvm/test/Bindings/Ocaml/scalar_opts.ml
index 7f850cbeb99f..0a65db996bb4 100644
--- a/llvm/test/Bindings/Ocaml/scalar_opts.ml
+++ b/llvm/test/Bindings/Ocaml/scalar_opts.ml
@@ -1,4 +1,4 @@
-(* RUN: %ocamlc -warn-error A llvm.cma llvm_scalar_opts.cma llvm_target.cma %s -o %t
+(* RUN: %ocamlc -warn-error A llvm.cma llvm_scalar_opts.cma llvm_target.cma %s -o %t 2> /dev/null
  *)
 
 (* Note: It takes several seconds for ocamlc to link an executable with
diff --git a/llvm/test/Bindings/Ocaml/target.ml b/llvm/test/Bindings/Ocaml/target.ml
index 2e83b318d8e3..e6d08ed6db75 100644
--- a/llvm/test/Bindings/Ocaml/target.ml
+++ b/llvm/test/Bindings/Ocaml/target.ml
@@ -1,4 +1,4 @@
-(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma %s -o %t
+(* RUN: %ocamlc -warn-error A llvm.cma llvm_target.cma %s -o %t 2> /dev/null
  *)
 
 (* Note: It takes several seconds for ocamlc to link an executable with
diff --git a/llvm/test/Bindings/Ocaml/vmcore.ml b/llvm/test/Bindings/Ocaml/vmcore.ml
index 694590885de2..e8fa1b5692df 100644
--- a/llvm/test/Bindings/Ocaml/vmcore.ml
+++ b/llvm/test/Bindings/Ocaml/vmcore.ml
@@ -1,4 +1,4 @@
-(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma llvm_bitwriter.cma %s -o %t
+(* RUN: %ocamlc -warn-error A llvm.cma llvm_analysis.cma llvm_bitwriter.cma %s -o %t 2> /dev/null
  * RUN: ./%t %t.bc
  * RUN: llvm-dis < %t.bc > %t.ll
  *)