[LLVMdev] r57974 & r57976 for PR2888

Gordon Henriksen gordonhenriksen at me.com
Wed Oct 22 06:00:13 PDT 2008 

Pending positive confirmation in http://llvm.org/PR2886, I'd recommend  
that r57974 and r57976 be pulled into the 2.4 release branch and  
configure regenerated there.

Begin forwarded message:

> From: Gordon Henriksen <gordonhenriksen at mac.com>
> Date: October 22, 2008 08:40:40 EDT
> To: llvm-commits at cs.uiuc.edu
> Subject: [llvm-commits] [llvm] r57974 - /llvm/trunk/autoconf/ 
> configure.ac
> Reply-To: Commit Messages and Patches for LLVM <llvm-commits at cs.uiuc.edu 
> >
>
> Author: gordon
> Date: Wed Oct 22 07:40:40 2008
> New Revision: 57974
>
> URL: http://llvm.org/viewvc/llvm-project?rev=57974&view=rev
> Log:
> [PR2886] Don't look for ocaml's .opt executables; something in the  
> autoconf/test machinery doesn't handle the period properly.
>
> Modified:
>    llvm/trunk/autoconf/configure.ac
>
> Modified: llvm/trunk/autoconf/configure.ac
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=57974&r1=57973&r2=57974&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/autoconf/configure.ac (original)
> +++ llvm/trunk/autoconf/configure.ac Wed Oct 22 07:40:40 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])
> AC_PATH_PROGS(GAS, [gas as])
>
> dnl Determine if the linker supports the -R option.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Begin forwarded message:

> From: Gordon Henriksen <gordonhenriksen at mac.com>
> Date: October 22, 2008 08:41:55 EDT
> To: llvm-commits at cs.uiuc.edu
> Subject: [llvm-commits] [llvm] r57976 - in /llvm/trunk/test/Bindings/ 
> Ocaml: analysis.ml bitreader.ml bitwriter.ml executionengine.ml  
> scalar_opts.ml target.ml vmcore.ml
> Reply-To: Commit Messages and Patches for LLVM <llvm-commits at cs.uiuc.edu 
> >
>
> Author: gordon
> Date: Wed Oct 22 07:41:54 2008
> New Revision: 57976
>
> URL: http://llvm.org/viewvc/llvm-project?rev=57976&view=rev
> Log:
> [PR2886] Ignore stderr from ocamlc since it prints unresolvable  
> warnings on some platforms.
>
> Modified:
>    llvm/trunk/test/Bindings/Ocaml/analysis.ml
>    llvm/trunk/test/Bindings/Ocaml/bitreader.ml
>    llvm/trunk/test/Bindings/Ocaml/bitwriter.ml
>    llvm/trunk/test/Bindings/Ocaml/executionengine.ml
>    llvm/trunk/test/Bindings/Ocaml/scalar_opts.ml
>    llvm/trunk/test/Bindings/Ocaml/target.ml
>    llvm/trunk/test/Bindings/Ocaml/vmcore.ml
>
> Modified: llvm/trunk/test/Bindings/Ocaml/analysis.ml
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/analysis.ml?rev=57976&r1=57975&r2=57976&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/Bindings/Ocaml/analysis.ml (original)
> +++ llvm/trunk/test/Bindings/Ocaml/analysis.ml Wed Oct 22 07:41:54  
> 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/trunk/test/Bindings/Ocaml/bitreader.ml
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/bitreader.ml?rev=57976&r1=57975&r2=57976&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/Bindings/Ocaml/bitreader.ml (original)
> +++ llvm/trunk/test/Bindings/Ocaml/bitreader.ml Wed Oct 22 07:41:54  
> 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/trunk/test/Bindings/Ocaml/bitwriter.ml
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/bitwriter.ml?rev=57976&r1=57975&r2=57976&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/Bindings/Ocaml/bitwriter.ml (original)
> +++ llvm/trunk/test/Bindings/Ocaml/bitwriter.ml Wed Oct 22 07:41:54  
> 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/trunk/test/Bindings/Ocaml/executionengine.ml
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/executionengine.ml?rev=57976&r1=57975&r2=57976&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/Bindings/Ocaml/executionengine.ml (original)
> +++ llvm/trunk/test/Bindings/Ocaml/executionengine.ml Wed Oct 22  
> 07:41:54 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/trunk/test/Bindings/Ocaml/scalar_opts.ml
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/scalar_opts.ml?rev=57976&r1=57975&r2=57976&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/Bindings/Ocaml/scalar_opts.ml (original)
> +++ llvm/trunk/test/Bindings/Ocaml/scalar_opts.ml Wed Oct 22  
> 07:41:54 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/trunk/test/Bindings/Ocaml/target.ml
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/target.ml?rev=57976&r1=57975&r2=57976&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/Bindings/Ocaml/target.ml (original)
> +++ llvm/trunk/test/Bindings/Ocaml/target.ml Wed Oct 22 07:41:54 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/trunk/test/Bindings/Ocaml/vmcore.ml
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/vmcore.ml?rev=57976&r1=57975&r2=57976&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/Bindings/Ocaml/vmcore.ml (original)
> +++ llvm/trunk/test/Bindings/Ocaml/vmcore.ml Wed Oct 22 07:41:54 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
>  *)
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



— Gordon

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20081022/ef32ac75/attachment.html>

More information about the llvm-dev mailing list