[llvm-commits] [llvm] r58033 - in /llvm/branches/release_24: autoconf/configure.ac configure test/Bindings/Ocaml/analysis.ml test/Bindings/Ocaml/bitreader.ml test/Bindings/Ocaml/bitwriter.ml test/Bindings/Ocaml/executionengine.ml test/Bindings/Ocaml/scalar_opts.ml test/Bindings/Ocaml/target.ml test/Bindings/Ocaml/vmcore.ml
Tanya Lattner
tonic at nondot.org
Wed Oct 22 22:44:06 PDT 2008
Author: tbrethou
Date: Thu Oct 23 00:44:04 2008
New Revision: 58033
URL: http://llvm.org/viewvc/llvm-project?rev=58033&view=rev
Log:
Merge from mainline for PR2886.
Modified:
llvm/branches/release_24/autoconf/configure.ac
llvm/branches/release_24/configure
llvm/branches/release_24/test/Bindings/Ocaml/analysis.ml
llvm/branches/release_24/test/Bindings/Ocaml/bitreader.ml
llvm/branches/release_24/test/Bindings/Ocaml/bitwriter.ml
llvm/branches/release_24/test/Bindings/Ocaml/executionengine.ml
llvm/branches/release_24/test/Bindings/Ocaml/scalar_opts.ml
llvm/branches/release_24/test/Bindings/Ocaml/target.ml
llvm/branches/release_24/test/Bindings/Ocaml/vmcore.ml
Modified: llvm/branches/release_24/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/autoconf/configure.ac?rev=58033&r1=58032&r2=58033&view=diff
==============================================================================
--- llvm/branches/release_24/autoconf/configure.ac (original)
+++ llvm/branches/release_24/autoconf/configure.ac Thu Oct 23 00:44:04 2008
@@ -610,10 +610,10 @@
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
Modified: llvm/branches/release_24/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/configure?rev=58033&r1=58032&r2=58033&view=diff
==============================================================================
--- llvm/branches/release_24/configure (original)
+++ llvm/branches/release_24/configure Thu Oct 23 00:44:04 2008
@@ -8139,7 +8139,7 @@
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 @@
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 @@
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 @@
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
Modified: llvm/branches/release_24/test/Bindings/Ocaml/analysis.ml
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/analysis.ml?rev=58033&r1=58032&r2=58033&view=diff
==============================================================================
--- llvm/branches/release_24/test/Bindings/Ocaml/analysis.ml (original)
+++ llvm/branches/release_24/test/Bindings/Ocaml/analysis.ml Thu Oct 23 00:44:04 2008
@@ -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
*)
Modified: llvm/branches/release_24/test/Bindings/Ocaml/bitreader.ml
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/bitreader.ml?rev=58033&r1=58032&r2=58033&view=diff
==============================================================================
--- llvm/branches/release_24/test/Bindings/Ocaml/bitreader.ml (original)
+++ llvm/branches/release_24/test/Bindings/Ocaml/bitreader.ml Thu Oct 23 00:44:04 2008
@@ -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
*)
Modified: llvm/branches/release_24/test/Bindings/Ocaml/bitwriter.ml
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/bitwriter.ml?rev=58033&r1=58032&r2=58033&view=diff
==============================================================================
--- llvm/branches/release_24/test/Bindings/Ocaml/bitwriter.ml (original)
+++ llvm/branches/release_24/test/Bindings/Ocaml/bitwriter.ml Thu Oct 23 00:44:04 2008
@@ -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
*)
Modified: llvm/branches/release_24/test/Bindings/Ocaml/executionengine.ml
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/executionengine.ml?rev=58033&r1=58032&r2=58033&view=diff
==============================================================================
--- llvm/branches/release_24/test/Bindings/Ocaml/executionengine.ml (original)
+++ llvm/branches/release_24/test/Bindings/Ocaml/executionengine.ml Thu Oct 23 00:44:04 2008
@@ -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
*)
Modified: llvm/branches/release_24/test/Bindings/Ocaml/scalar_opts.ml
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/scalar_opts.ml?rev=58033&r1=58032&r2=58033&view=diff
==============================================================================
--- llvm/branches/release_24/test/Bindings/Ocaml/scalar_opts.ml (original)
+++ llvm/branches/release_24/test/Bindings/Ocaml/scalar_opts.ml Thu Oct 23 00:44:04 2008
@@ -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
Modified: llvm/branches/release_24/test/Bindings/Ocaml/target.ml
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/target.ml?rev=58033&r1=58032&r2=58033&view=diff
==============================================================================
--- llvm/branches/release_24/test/Bindings/Ocaml/target.ml (original)
+++ llvm/branches/release_24/test/Bindings/Ocaml/target.ml Thu Oct 23 00:44:04 2008
@@ -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
Modified: llvm/branches/release_24/test/Bindings/Ocaml/vmcore.ml
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/test/Bindings/Ocaml/vmcore.ml?rev=58033&r1=58032&r2=58033&view=diff
==============================================================================
--- llvm/branches/release_24/test/Bindings/Ocaml/vmcore.ml (original)
+++ llvm/branches/release_24/test/Bindings/Ocaml/vmcore.ml Thu Oct 23 00:44:04 2008
@@ -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
*)
More information about the llvm-commits
mailing list