Skip to content

Commit 4c7ee83

Browse files
committed
Move stage0 into src/parrot/vm/.
The stage0 is inherently platform specific, since it's generated code.
1 parent d6ff63d commit 4c7ee83

File tree

10 files changed

+30
-30
lines changed

10 files changed

+30
-30
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tools/build/Makefile.in

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,17 @@ CORE_SETTING_SOURCES = \
124124
CORE_SETTING_NQP = NQPCORE.setting
125125

126126
STAGE0_SOURCES = \
127-
src/stage0/NQPMO-s0.pir \
128-
src/stage0/ModuleLoader-s0.pir \
129-
src/stage0/NQPCORE.setting-s0.pir \
130-
src/stage0/QASTNode-s0.pir \
131-
src/stage0/QRegex-s0.pir \
132-
src/stage0/HLL-s0.pir \
133-
src/stage0/QAST-s0.pir \
134-
src/stage0/P6QRegex-s0.pir \
135-
src/stage0/NQP-s0.pir
136-
137-
STAGE0 = src/stage0
127+
src/vm/parrot/stage0/NQPMO-s0.pir \
128+
src/vm/parrot/stage0/ModuleLoader-s0.pir \
129+
src/vm/parrot/stage0/NQPCORE.setting-s0.pir \
130+
src/vm/parrot/stage0/QASTNode-s0.pir \
131+
src/vm/parrot/stage0/QRegex-s0.pir \
132+
src/vm/parrot/stage0/HLL-s0.pir \
133+
src/vm/parrot/stage0/QAST-s0.pir \
134+
src/vm/parrot/stage0/P6QRegex-s0.pir \
135+
src/vm/parrot/stage0/NQP-s0.pir
136+
137+
STAGE0 = src/vm/parrot/stage0
138138
STAGE1 = src/stage1
139139
STAGE2 = src/stage2
140140

@@ -511,7 +511,7 @@ CLEANUPS = \
511511
$(PARROT_DLL_COPY) \
512512
*.c\
513513
*.o\
514-
src/stage0/*.pbc \
514+
src/vm/parrot/stage0/*.pbc \
515515
src/stage1/gen/* \
516516
src/stage1/*.pbc \
517517
src/stage2/gen/* \
@@ -580,15 +580,15 @@ stage2: $(STAGE2)
580580
$(STAGE0): $(STAGE0_PBCS)
581581

582582
$(STAGE0_PBCS): $(DYNEXT_TARGET) $(STAGE0_SOURCES)
583-
$(PARROT) -o $(STAGE0)/$(NQP_MO_PBC) src/stage0/NQPMO-s0.pir
584-
$(PARROT) -o $(STAGE0)/$(MODULE_LOADER_PBC) src/stage0/ModuleLoader-s0.pir
585-
$(PARROT) -o $(STAGE0)/$(CORE_SETTING_PBC) src/stage0/NQPCORE.setting-s0.pir
586-
$(PARROT) -o $(STAGE0)/$(QASTNODE_PBC) src/stage0/QASTNode-s0.pir
587-
$(PARROT) -o $(STAGE0)/$(QREGEX_PBC) src/stage0/QRegex-s0.pir
588-
$(PARROT) -o $(STAGE0)/$(HLL_PBC) src/stage0/HLL-s0.pir
589-
$(PARROT) -o $(STAGE0)/$(QAST_PBC) src/stage0/QAST-s0.pir
590-
$(PARROT) -o $(STAGE0)/$(P6QREGEX_PBC) src/stage0/P6QRegex-s0.pir
591-
$(PARROT) -o $(STAGE0)/$(NQP_PBC) src/stage0/NQP-s0.pir
583+
$(PARROT) -o $(STAGE0)/$(NQP_MO_PBC) src/vm/parrot/stage0/NQPMO-s0.pir
584+
$(PARROT) -o $(STAGE0)/$(MODULE_LOADER_PBC) src/vm/parrot/stage0/ModuleLoader-s0.pir
585+
$(PARROT) -o $(STAGE0)/$(CORE_SETTING_PBC) src/vm/parrot/stage0/NQPCORE.setting-s0.pir
586+
$(PARROT) -o $(STAGE0)/$(QASTNODE_PBC) src/vm/parrot/stage0/QASTNode-s0.pir
587+
$(PARROT) -o $(STAGE0)/$(QREGEX_PBC) src/vm/parrot/stage0/QRegex-s0.pir
588+
$(PARROT) -o $(STAGE0)/$(HLL_PBC) src/vm/parrot/stage0/HLL-s0.pir
589+
$(PARROT) -o $(STAGE0)/$(QAST_PBC) src/vm/parrot/stage0/QAST-s0.pir
590+
$(PARROT) -o $(STAGE0)/$(P6QREGEX_PBC) src/vm/parrot/stage0/P6QRegex-s0.pir
591+
$(PARROT) -o $(STAGE0)/$(NQP_PBC) src/vm/parrot/stage0/NQP-s0.pir
592592

593593
$(STAGE1): $(STAGE1_PBCS)
594594

@@ -1082,15 +1082,15 @@ $(NQP_CONST_PIR):
10821082
perl tools/build/generate-constants.pl > $@
10831083

10841084
bootstrap-files: $(STAGE2_PBCS) src/stage2/$(CORE_SETTING_NQP)
1085-
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(NQP_MO_PIR) >src/stage0/NQPMO-s0.pir
1086-
$(PERL) tools/build/gen-bootstrap.pl src/stage2/gen/module_loader.pir >src/stage0/ModuleLoader-s0.pir
1087-
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(CORE_SETTING_PIR) >src/stage0/NQPCORE.setting-s0.pir
1088-
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QASTNODE_PIR) >src/stage0/QASTNode-s0.pir
1089-
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QREGEX_PIR) >src/stage0/QRegex-s0.pir
1090-
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(HLL_COMBINED_PIR) >src/stage0/HLL-s0.pir
1091-
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QAST_PIR) >src/stage0/QAST-s0.pir
1092-
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(P6QREGEX_COMBINED_PIR) >src/stage0/P6QRegex-s0.pir
1093-
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(NQP_COMBINED_PIR) >src/stage0/NQP-s0.pir
1085+
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(NQP_MO_PIR) >src/vm/parrot/stage0/NQPMO-s0.pir
1086+
$(PERL) tools/build/gen-bootstrap.pl src/stage2/gen/module_loader.pir >src/vm/parrot/stage0/ModuleLoader-s0.pir
1087+
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(CORE_SETTING_PIR) >src/vm/parrot/stage0/NQPCORE.setting-s0.pir
1088+
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QASTNODE_PIR) >src/vm/parrot/stage0/QASTNode-s0.pir
1089+
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QREGEX_PIR) >src/vm/parrot/stage0/QRegex-s0.pir
1090+
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(HLL_COMBINED_PIR) >src/vm/parrot/stage0/HLL-s0.pir
1091+
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(QAST_PIR) >src/vm/parrot/stage0/QAST-s0.pir
1092+
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(P6QREGEX_COMBINED_PIR) >src/vm/parrot/stage0/P6QRegex-s0.pir
1093+
$(PERL) tools/build/gen-bootstrap.pl src/stage2/$(NQP_COMBINED_PIR) >src/vm/parrot/stage0/NQP-s0.pir
10941094

10951095
## testing
10961096

0 commit comments

Comments
 (0)