Done. Committed as r10516 & r10517. -J
--
On Mon, Dec 12, 2005 at 05:31:02PM -1000, Joshua Hoblitt wrote:
> On Mon, Dec 12, 2005 at 06:14:21PM -0800, jerry gay wrote:
> > specifically, joshua, when do you think you'll have tuits to dive into
> > the jit config system? no pressure--if it waits until next year, so be
> > it. i have some testing tasks i can keep busy with in the meantime.
> > based on that info, i can ask the folk with platforms not available to
> > the parrot committers if they might have time to submit test/smoke
> > reports during and after the changeover, to make sure our next release
> > doesn't break any platforms due to this change.
>
> I don't think it'll have to wait until next year. I just centralized
> the jit src base path in config/auto/jit.pm to be set in one variable
> named $jibase. So it should be as simple as moving jit -> src/jit and
> applying the attached patch. I tested moving the jit dir on x86 and it
> works, at least to the extent that testj gives me the same test failures
> and the same infinite hang on 't/compilers/pge/pge_examples.........'.
>
> Cheers,
>
> -J
>
> --
> Index: config/auto/jit.pm
> ===================================================================
> --- config/auto/jit.pm (revision 10480)
> +++ config/auto/jit.pm (working copy)
> @@ -31,7 +31,7 @@
>
> return if $miniparrot;
>
> - my $jitbase = "jit"; # base path for jit sources
> + my $jitbase = "src/jit"; # base path for jit sources
> my $archname = $Config{archname};
> my ($cpuarch, $osname) = split( /-/, $archname);
>
> Index: config/gen/makefiles/root.in
> ===================================================================
> --- config/gen/makefiles/root.in (revision 10480)
> +++ config/gen/makefiles/root.in (working copy)
> @@ -1115,15 +1115,15 @@
> $(INC_DIR)/vtable.h : vtable.tbl $(BUILD_TOOLS_DIR)/vtable_h.pl
> lib/Parrot/Vtable.pm
> $(PERL) $(BUILD_TOOLS_DIR)/vtable_h.pl
>
> -$(INC_DIR)/jit_emit.h : jit/${jitcpuarch}/jit_emit.h
> - $(CP) jit/${jitcpuarch}/jit_emit.h $(INC_DIR)/jit_emit.h
> -$(INC_DIR)/exec_dep.h : jit/${jitcpuarch}/exec_dep.h
> - $(CP) jit/${jitcpuarch}/exec_dep.h $(INC_DIR)/exec_dep.h
> +$(INC_DIR)/jit_emit.h : $(SRC_DIR)/jit/${jitcpuarch}/jit_emit.h
> + $(CP) $(SRC_DIR)/jit/${jitcpuarch}/jit_emit.h $(INC_DIR)/jit_emit.h
> +$(INC_DIR)/exec_dep.h : $(SRC_DIR)/jit/${jitcpuarch}/exec_dep.h
> + $(CP) $(SRC_DIR)/jit/${jitcpuarch}/exec_dep.h $(INC_DIR)/exec_dep.h
> $(SRC_DIR)/jit_cpu.c : lib/Parrot/OpLib/core.pm $(INC_DIR)/jit_emit.h \
> - jit/${jitcpuarch}/core.jit $(BUILD_TOOLS_DIR)/jit2h.pl
> + $(SRC_DIR)/jit/${jitcpuarch}/core.jit $(BUILD_TOOLS_DIR)/jit2h.pl
> $(PERL) $(BUILD_TOOLS_DIR)/jit2h.pl ${jitcpuarch} $(SRC_DIR)/jit_cpu.c
> $(SRC_DIR)/exec_cpu.c : lib/Parrot/OpLib/core.pm $(INC_DIR)/jit_emit.h \
> - jit/${jitcpuarch}/core.jit ${TEMP_exec_h} $(INC_DIR)/exec_dep.h
> $(BUILD_TOOLS_DIR)/jit2h.pl
> + $(SRC_DIR)/jit/${jitcpuarch}/core.jit ${TEMP_exec_h}
> $(INC_DIR)/exec_dep.h $(BUILD_TOOLS_DIR)/jit2h.pl
> $(PERL) $(BUILD_TOOLS_DIR)/jit2h.pl ${jitcpuarch} $(SRC_DIR)/exec_cpu.c
>
> # imcc file dependencies
pgp7rrNdWUL0k.pgp
Description: PGP signature
