cvsuser 03/10/23 12:54:10
Modified: build_tools build_nativecall.pl
config/auto gc.pl jit.pl
config/gen core_pmcs.pl platform.pl
config/gen/makefiles root.in
Log:
Closer -- just need to link right
Revision Changes Path
1.28 +2 -2 parrot/build_tools/build_nativecall.pl
Index: build_nativecall.pl
===================================================================
RCS file: /cvs/public/parrot/build_tools/build_nativecall.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -r1.27 -r1.28
--- build_nativecall.pl 23 Oct 2003 17:44:32 -0000 1.27
+++ build_nativecall.pl 23 Oct 2003 19:54:03 -0000 1.28
@@ -106,7 +106,7 @@
v => "",
);
-open NCI, ">nci.c" or die "Can't open nci.c!";
+open NCI, ">src/nci.c" or die "Can't open nci.c!";
print NCI <<'HEAD';
/*
@@ -121,7 +121,7 @@
/* nci.c
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: build_nativecall.pl,v 1.27 2003/10/23 17:44:32 robert Exp $
+ * $Id: build_nativecall.pl,v 1.28 2003/10/23 19:54:03 dan Exp $
* Overview:
* Native Call Interface routines. The code needed to build a
* parrot to C call frame is in here
1.2 +7 -7 parrot/config/auto/gc.pl
Index: gc.pl
===================================================================
RCS file: /cvs/public/parrot/config/auto/gc.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- gc.pl 5 Oct 2002 09:40:34 -0000 1.1
+++ gc.pl 23 Oct 2003 19:54:05 -0000 1.2
@@ -35,19 +35,19 @@
if ($gc =~ /^malloc(?:-trace)?$/) {
Configure::Data->set(
gc_c => <<"EOF",
-$gc\$(O): \$(GENERAL_H_FILES) $gc.c
-res_lea\$(O): \$(GENERAL_H_FILES) res_lea.c
+\$(SRC)/$gc\$(O): \$(GENERAL_H_FILES) \$(SRC)/$gc.c
+\$(SRC)/res_lea\$(O): \$(GENERAL_H_FILES) \$(SRC)/res_lea.c
EOF
- gc_o => "$gc\$(O) res_lea\$(O)",
+ gc_o => "\$(SRC).\/$gc\$(O) \$(SRC)/res_lea\$(O)",
gc_flag => '-DGC_IS_MALLOC',
);
}
elsif ($gc eq 'libc') {
Configure::Data->set(
gc_c => <<"EOF",
-res_lea\$(O): \$(GENERAL_H_FILES) res_lea.c
+\$(SRC)/res_lea\$(O): \$(GENERAL_H_FILES) \$(SRC)/res_lea.c
EOF
- gc_o => "res_lea\$(O)",
+ gc_o => "\$(SRC)/res_lea\$(O)",
gc_flag => '-DGC_IS_MALLOC',
);
}
@@ -55,9 +55,9 @@
$gc = 'gc';
Configure::Data->set(
gc_c => <<"EOF",
-resources\$(O): \$(GENERAL_H_FILES) resources.c
+$(SRC)/resources\$(O): \$(GENERAL_H_FILES) \$(SRC)/resources.c
EOF
- gc_o => "resources\$(O)",
+ gc_o => "\$(SRC)/resources\$(O)",
gc_flag => '',
);
}
1.24 +2 -2 parrot/config/auto/jit.pl
Index: jit.pl
===================================================================
RCS file: /cvs/public/parrot/config/auto/jit.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- jit.pl 13 Oct 2003 13:36:05 -0000 1.23
+++ jit.pl 23 Oct 2003 19:54:05 -0000 1.24
@@ -96,7 +96,7 @@
jitcapable => 1,
cc_hasjit => " -DHAS_JIT -D\U$jitcpuarch",
jit_h => '$(INC)/jit.h',
- jit_o => 'jit$(O) jit_cpu$(O) jit_debug$(O) jit_debug_xcoff$(O)'
+ jit_o => '$(SRC)/jit$(O) $(SRC)/jit_cpu$(O) $(SRC)/jit_debug$(O)
$(SRC)/jit_debug_xcoff$(O)'
);
if (($jitcpuarch eq 'i386' && ($osname =~ /bsd$/i || $osname =~ /linux/i))
@@ -115,7 +115,7 @@
if ($execcapable) {
Configure::Data->set(
exec_h => '$(INC)/jit.h $(INC)/exec.h $(INC)/exec_dep.h
$(INC)/exec_save.h',
- exec_o => 'exec$(O) exec_cpu$(O) exec_save$(O)',
+ exec_o => '$(SRC)/exec$(O) $(SRC)/exec_cpu$(O) $(SRC)/exec_save$(O)',
execcapable => 1
);
}
1.11 +1 -1 parrot/config/gen/core_pmcs.pl
Index: core_pmcs.pl
===================================================================
RCS file: /cvs/public/parrot/config/gen/core_pmcs.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- core_pmcs.pl 22 Sep 2003 19:27:40 -0000 1.10
+++ core_pmcs.pl 23 Oct 2003 19:54:07 -0000 1.11
@@ -45,7 +45,7 @@
}
sub generate_c {
- my $file = "core_pmcs.c";
+ my $file = "src/core_pmcs.c";
my @pmcs = split(/ /, Configure::Data->get('pmc_names'));
open(OUT, ">$file.tmp");
1.5 +1 -1 parrot/config/gen/platform.pl
Index: platform.pl
===================================================================
RCS file: /cvs/public/parrot/config/gen/platform.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- platform.pl 6 Jun 2003 08:29:39 -0000 1.4
+++ platform.pl 23 Oct 2003 19:54:07 -0000 1.5
@@ -15,7 +15,7 @@
$platform="ansi" if defined($_[0]);
$platform="generic" unless -e "config/gen/platform/$platform.c";
- copy_if_diff("config/gen/platform/$platform.c", "platform.c");
+ copy_if_diff("config/gen/platform/$platform.c", "src/platform.c");
copy_if_diff("config/gen/platform/$platform.h", "include/parrot/platform.h");
copy_if_diff("config/gen/platform/platform_interface.h",
"include/parrot/platform_interface.h");
1.157 +4 -4 parrot/config/gen/makefiles/root.in
Index: root.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -w -r1.156 -r1.157
--- root.in 23 Oct 2003 19:21:27 -0000 1.156
+++ root.in 23 Oct 2003 19:54:09 -0000 1.157
@@ -553,8 +553,8 @@
$(SRC)/cpu_dep$(O) : $(GENERAL_H_FILES)
-$(SRC)/nci.c : $(SRC)/call_list.txt build_nativecall.pl
- $(PERL) build_nativecall.pl $(SRC)/call_list.txt
+$(SRC)/nci.c : $(SRC)/call_list.txt $(BUILD_TOOL)/build_nativecall.pl
+ $(PERL) $(BUILD_TOOL)/build_nativecall.pl $(SRC)/call_list.txt
#core_ops depends upon config.h so that it gets updated along with updates to
config.h's version numbers
$(SRC)/core_ops.c $(INC)/oplib/core_ops.h : $(OPS_FILES) $(BUILD_TOOL)/ops2c.pl
lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(INC)/config.h lib/Parrot/OpLib/core.pm
@@ -595,8 +595,8 @@
$(INC)/exec_dep.h: jit/${jitcpuarch}/exec_dep.h
$(PERL) -MFile::Copy=cp -e ${PQ}cp q|jit/${jitcpuarch}/exec_dep.h|,
q|$(INC)/exec_dep.h|${PQ}
$(SRC)/jit_cpu.c: lib/Parrot/OpLib/core.pm $(INC)/jit_emit.h \
- jit/${jitcpuarch}/core.jit jit2h.pl
- $(PERL) $(BUILD_TOOL)/jit2h.pl ${jitcpuarch} jit_cpu.c
+ jit/${jitcpuarch}/core.jit $(BUILD_TOOL)/jit2h.pl
+ $(PERL) $(BUILD_TOOL)/jit2h.pl ${jitcpuarch} $(SRC)/jit_cpu.c
$(SRC)/exec_cpu.c: lib/Parrot/OpLib/core.pm $(INC)/jit_emit.h \
jit/${jitcpuarch}/core.jit ${exec_h} $(INC)/exec_dep.h
$(BUILD_TOOL)/jit2h.pl
$(PERL) $(BUILD_TOOL)/jit2h.pl ${jitcpuarch} $(SRC)/exec_cpu.c
