[svn:parrot] r48741 - in trunk: . config/auto config/auto/llvm config/auto/sizes docs/book/draft docs/book/pct docs/dev docs/pdds examples/embed examples/languages/abc examples/languages/squaak examples/pge include/parrot lib/Parrot/Configure/Step ports/cygwin ports/debian runtime/parrot/languages runtime/parrot/library/Math src/call src/gc src/interp src/runcore t/compilers/tge t/oo t/pmc t/src t/steps/auto tools/dev
jkeenan at svn.parrot.org
jkeenan at svn.parrot.org
Wed Sep 1 01:57:31 UTC 2010
Author: jkeenan
Date: Wed Sep 1 01:57:31 2010
New Revision: 48741
URL: https://trac.parrot.org/parrot/changeset/48741
Log:
Merge detect_llvm branch into trunk. Adds configuration step auto::llvm to detect Low Level Virtual Machine (LLVM) and associated test file.
Added:
trunk/config/auto/llvm/
- copied from r48740, branches/detect_llvm/config/auto/llvm/
trunk/config/auto/llvm.pm
- copied, changed from r48740, branches/detect_llvm/config/auto/llvm.pm
trunk/t/steps/auto/llvm-01.t
- copied, changed from r48740, branches/detect_llvm/t/steps/auto/llvm-01.t
Replaced:
trunk/config/auto/llvm/hello.c
- copied, changed from r48740, branches/detect_llvm/config/auto/llvm/hello.c
Modified:
trunk/ (props changed)
trunk/MANIFEST
trunk/config/auto/sizes/intval_maxmin_c.in (props changed)
trunk/docs/book/draft/README (props changed)
trunk/docs/book/draft/appa_glossary.pod (props changed)
trunk/docs/book/draft/appb_patch_submission.pod (props changed)
trunk/docs/book/draft/appc_command_line_options.pod (props changed)
trunk/docs/book/draft/appd_build_options.pod (props changed)
trunk/docs/book/draft/appe_source_code.pod (props changed)
trunk/docs/book/draft/ch01_introduction.pod (props changed)
trunk/docs/book/draft/ch02_getting_started.pod (props changed)
trunk/docs/book/draft/ch07_dynpmcs.pod (props changed)
trunk/docs/book/draft/ch08_dynops.pod (props changed)
trunk/docs/book/draft/ch10_opcode_reference.pod (props changed)
trunk/docs/book/draft/ch11_directive_reference.pod (props changed)
trunk/docs/book/draft/ch12_operator_reference.pod (props changed)
trunk/docs/book/draft/chXX_hlls.pod (props changed)
trunk/docs/book/draft/chXX_library.pod (props changed)
trunk/docs/book/draft/chXX_testing_and_debugging.pod (props changed)
trunk/docs/book/pct/ch01_introduction.pod (props changed)
trunk/docs/book/pct/ch02_getting_started.pod (props changed)
trunk/docs/book/pct/ch03_compiler_tools.pod (props changed)
trunk/docs/book/pct/ch04_pge.pod (props changed)
trunk/docs/book/pct/ch05_nqp.pod (props changed)
trunk/docs/dev/c_functions.pod (props changed)
trunk/docs/pdds/pdd30_install.pod (props changed)
trunk/examples/embed/cotorra.c (props changed)
trunk/examples/languages/abc/ (props changed)
trunk/examples/languages/squaak/ (props changed)
trunk/examples/pge/demo.pir (props changed)
trunk/include/parrot/call.h (props changed)
trunk/include/parrot/gc_api.h (props changed)
trunk/include/parrot/runcore_api.h (props changed)
trunk/include/parrot/runcore_profiling.h (props changed)
trunk/include/parrot/runcore_trace.h (props changed)
trunk/lib/Parrot/Configure/Step/List.pm
trunk/ports/cygwin/parrot-1.0.0-1.cygport (props changed)
trunk/ports/debian/libparrot-dev.install.in (props changed)
trunk/ports/debian/libparrot.install.in (props changed)
trunk/ports/debian/parrot-doc.install.in (props changed)
trunk/ports/debian/parrot.install.in (props changed)
trunk/runtime/parrot/languages/ (props changed)
trunk/runtime/parrot/library/Math/Rand.pir (props changed)
trunk/src/call/ops.c (props changed)
trunk/src/call/pcc.c (props changed)
trunk/src/gc/alloc_memory.c (props changed)
trunk/src/gc/alloc_resources.c (props changed)
trunk/src/gc/api.c (props changed)
trunk/src/gc/malloc.c (props changed)
trunk/src/gc/malloc_trace.c (props changed)
trunk/src/gc/mark_sweep.c (props changed)
trunk/src/gc/system.c (props changed)
trunk/src/interp/inter_cb.c (props changed)
trunk/src/interp/inter_create.c (props changed)
trunk/src/interp/inter_misc.c (props changed)
trunk/src/runcore/cores.c (props changed)
trunk/src/runcore/main.c (props changed)
trunk/src/runcore/profiling.c (props changed)
trunk/src/runcore/trace.c (props changed)
trunk/t/compilers/tge/NoneGrammar.tg (props changed)
trunk/t/oo/root_new.t (props changed)
trunk/t/pmc/namespace-old.t (props changed)
trunk/t/src/embed.t (props changed)
trunk/tools/dev/fetch_languages.pl (props changed)
trunk/tools/dev/mk_gitignore.pl (props changed)
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST Tue Aug 31 22:39:44 2010 (r48740)
+++ trunk/MANIFEST Wed Sep 1 01:57:31 2010 (r48741)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Sat Aug 28 02:23:15 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Wed Sep 1 00:17:03 2010 UT
#
# See below for documentation on the format of this file.
#
@@ -214,6 +214,8 @@
config/auto/isreg.pm []
config/auto/isreg/test_c.in []
config/auto/jit.pm []
+config/auto/llvm.pm []
+config/auto/llvm/hello.c []
config/auto/memalign.pm []
config/auto/memalign/test2_c.in []
config/auto/memalign/test_c.in []
@@ -1992,6 +1994,7 @@
t/steps/auto/inline-01.t [test]
t/steps/auto/isreg-01.t [test]
t/steps/auto/jit-01.t [test]
+t/steps/auto/llvm-01.t [test]
t/steps/auto/memalign-01.t [test]
t/steps/auto/msvc-01.t [test]
t/steps/auto/neg_0-01.t [test]
Copied and modified: trunk/config/auto/llvm.pm (from r48740, branches/detect_llvm/config/auto/llvm.pm)
==============================================================================
--- branches/detect_llvm/config/auto/llvm.pm Tue Aug 31 22:39:44 2010 (r48740, copy source)
+++ trunk/config/auto/llvm.pm Wed Sep 1 01:57:31 2010 (r48741)
@@ -57,7 +57,7 @@
$llvm_lacking = _examine_llvm_gcc_version(
$output, $llvm_lacking, $verbose
);
-
+
# Finally, we see whether our LLVM actually works.
if ( $llvm_lacking ) {
$self->_handle_result( $conf, 0 );
Copied and modified: trunk/config/auto/llvm/hello.c (from r48740, branches/detect_llvm/config/auto/llvm/hello.c)
==============================================================================
--- branches/detect_llvm/config/auto/llvm/hello.c Tue Aug 31 22:39:44 2010 (r48740, copy source)
+++ trunk/config/auto/llvm/hello.c Wed Sep 1 01:57:31 2010 (r48741)
@@ -1,6 +1,41 @@
+/*
+ *
+Copyright (C) 2009, Parrot Foundation.
+$Id$
+
+=head1
+
+Test file only.
+
+=over 4
+
+=item C<int main()>
+
+Test file only.
+
+=cut
+
+*/
+
#include <stdio.h>
int main() {
printf("hello world\n");
return 0;
}
+
+/*
+
+=back
+
+=cut
+
+*/
+
+
+/*
+ * Local variables:
+ * c-file-style: "parrot"
+ * End:
+ * vim: expandtab shiftwidth=4:
+ */
Modified: trunk/lib/Parrot/Configure/Step/List.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Step/List.pm Tue Aug 31 22:39:44 2010 (r48740)
+++ trunk/lib/Parrot/Configure/Step/List.pm Wed Sep 1 01:57:31 2010 (r48741)
@@ -41,6 +41,7 @@
auto::isreg
auto::jit
auto::frames
+ auto::llvm
auto::inline
auto::gc
auto::memalign
Copied and modified: trunk/t/steps/auto/llvm-01.t (from r48740, branches/detect_llvm/t/steps/auto/llvm-01.t)
==============================================================================
--- branches/detect_llvm/t/steps/auto/llvm-01.t Tue Aug 31 22:39:44 2010 (r48740, copy source)
+++ trunk/t/steps/auto/llvm-01.t Wed Sep 1 01:57:31 2010 (r48741)
@@ -336,7 +336,7 @@
);
is( $step->result(), 'no', "Got expected 'no' result" );
like(
- $stdout,
+ $stdout,
qr/Unable to execute native assembly program successfully/,
"Got expected verbose output: native assembly program",
);
@@ -354,7 +354,7 @@
);
is( $step->result(), 'no', "Got expected 'no' result" );
like(
- $stdout,
+ $stdout,
qr/Unable to execute native assembly program successfully/,
"Got expected verbose output: native assembly program",
);
More information about the parrot-commits
mailing list