Permalink
Browse files

split NCI signature parser out from nci.pmc

this will allow multiple NCI backends (static compiler, static runtime, libffi) to share the same parser

also miscelaneous fixes to get fulltest mostly working (svn props mostly)


git-svn-id: https://svn.parrot.org/parrot/branches/gsoc_nci@49693 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
1 parent e99d1ef commit c64fa8d39a5e314a0080315e8d0e033c5860e9cf @plobsing plobsing committed Oct 27, 2010
View
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Sep 29 04:41:54 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Wed Oct 27 07:17:39 2010 UT
#
# See below for documentation on the format of this file.
#
@@ -214,6 +214,8 @@ config/auto/inline/test2_c.in []
config/auto/isreg.pm []
config/auto/isreg/test_c.in []
config/auto/jit.pm []
+config/auto/libffi.pm []
+config/auto/libffi/test_c.in []
config/auto/llvm.pm []
config/auto/llvm/hello.c []
config/auto/memalign.pm []
@@ -266,6 +268,9 @@ config/gen/config_pm/config_lib_pir.in []
config/gen/config_pm/config_pir.in []
config/gen/config_pm/myconfig.in []
config/gen/core_pmcs.pm []
+config/gen/libffi.pm []
+config/gen/libffi/nci-ffi.pmc.in []
+config/gen/libffi/nci.pmc.in []
config/gen/makefiles.pm []
config/gen/makefiles/docs.in []
config/gen/makefiles/editor.in []
@@ -1331,6 +1336,7 @@ src/nci/core_thunks.c []
src/nci/core_thunks.nci []
src/nci/extra_thunks.c []
src/nci/extra_thunks.nci []
+src/nci/signatures.c []
src/nci_test.c []
src/oo.c []
src/ops/bit.ops []
@@ -1988,6 +1994,7 @@ t/steps/auto/icu-01.t [test]
t/steps/auto/inline-01.t [test]
t/steps/auto/isreg-01.t [test]
t/steps/auto/jit-01.t [test]
+t/steps/auto/libffi-01.t [test]
t/steps/auto/llvm-01.t [test]
t/steps/auto/memalign-01.t [test]
t/steps/auto/msvc-01.t [test]
@@ -2013,6 +2020,7 @@ t/steps/gen/config_h-01.t [test]
t/steps/gen/config_pm-01.t [test]
t/steps/gen/core_pmcs-01.t [test]
t/steps/gen/crypto-01.t [test]
+t/steps/gen/libffi-01.t [test]
t/steps/gen/makefiles-01.t [test]
t/steps/gen/opengl-01.t [test]
t/steps/gen/platform-01.t [test]
@@ -2129,6 +2137,7 @@ tools/dev/mk_nci_thunks.pl []
tools/dev/mk_packfile_pbc []
tools/dev/mk_rpm_manifests.pl []
tools/dev/nci_test_gen.pl []
+tools/dev/nci_thunk_gen.nqp []
tools/dev/nci_thunk_gen.pir []
tools/dev/ncidef2pasm.pl []
tools/dev/nm.pl []
View
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Thu Sep 23 09:20:45 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Wed Oct 27 07:17:39 2010 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -845,8 +845,6 @@
^src/packfile/.*\.o/
^src/packfile/.*\.obj$
^src/packfile/.*\.obj/
-^src/packfile/.*\.str$
-^src/packfile/.*\.str/
# generated from svn:ignore of 'src/pmc/'
^src/pmc/.*\.c$
^src/pmc/.*\.c/
@@ -1032,9 +1030,6 @@
^t/op/.*\.pir/
^t/op/.*_pbcexe.*$
^t/op/.*_pbcexe.*/
-# generated from svn:ignore of 't/op/testlib/'
-^t/op/testlib/.*\.pbc$
-^t/op/testlib/.*\.pbc/
# generated from svn:ignore of 't/perl/'
^t/perl/Parrot_Test_1\.pasm$
^t/perl/Parrot_Test_1\.pasm/
@@ -1051,9 +1046,6 @@
^t/pmc/.*\.pir/
^t/pmc/.*_pbcexe.*$
^t/pmc/.*_pbcexe.*/
-# generated from svn:ignore of 't/pmc/testlib/'
-^t/pmc/testlib/.*\.pbc$
-^t/pmc/testlib/.*\.pbc/
# generated from svn:ignore of 't/src/'
^t/src/.*_.*$
^t/src/.*_.*/
@@ -1085,9 +1077,6 @@
^t/tools/pmc2c\..*\.h/
^t/tools/pmc2c\..*\.pmc$
^t/tools/pmc2c\..*\.pmc/
-# generated from svn:ignore of 'tools/dev/'
-^tools/dev/mk_language_shell\.pl$
-^tools/dev/mk_language_shell\.pl/
# Local variables:
# mode: text
# buffer-read-only: t
View
@@ -54,7 +54,7 @@ sub runstep {
my $libffi_options_cflags = '';
my $libffi_options_libs = '';
my $libffi_options_linkflags = '';
-
+
if ($pkgconfig_exec) {
$libffi_options_linkflags = capture_output($pkgconfig_exec, 'libffi --libs-only-L');
chomp $libffi_options_linkflags;
@@ -70,7 +70,7 @@ sub runstep {
cc => $conf->data->get('cc'),
default => $libffi_options_libs . ' ' . $libffi_options_cflags,
} );
-
+
$conf->cc_gen('config/auto/libffi/test_c.in');
eval { $conf->cc_build( $libffi_options_cflags, $libffi_options_libs ) };
my $has_libffi = 0;
View
@@ -25,7 +25,7 @@ sub _init {
my %data;
$data{description} = q{Moving approriate NCI files into place};
-
+
return \%data;
}
@@ -39,7 +39,7 @@ sub runstep {
else {
}
- copy_if_diff( $nci_file, "src/pmc/nci.pmc" );
+ copy_if_diff( $nci_file, "src/pmc/nci.pmc" );
return 1;
}
Oops, something went wrong.

0 comments on commit c64fa8d

Please sign in to comment.