diff --git a/Configure.pl b/Configure.pl index 56fc4ee..012d9ec 100644 --- a/Configure.pl +++ b/Configure.pl @@ -358,18 +358,10 @@ Use the given type for opcodes. Use the given ops files. -=item C<--jitcapable> - -Use JIT system. - =item C<--buildframes> Dynamically build NCI call frames. -=item C<--execcapable> - -Use JIT to emit a native executable. - =back =head2 International Components For Unicode (ICU) Options diff --git a/MANIFEST b/MANIFEST index ccae08c..06deecb 100644 --- a/MANIFEST +++ b/MANIFEST @@ -167,7 +167,6 @@ config/auto/ipv6.pm [] config/auto/ipv6/test.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 [] @@ -1987,7 +1986,6 @@ t/steps/auto/icu-01.t [test] t/steps/auto/inline-01.t [test] t/steps/auto/ipv6-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] diff --git a/config/gen/config_h/config_h.in b/config/gen/config_h/config_h.in index d2dd1f9..09cc1b2 100644 --- a/config/gen/config_h/config_h.in +++ b/config/gen/config_h/config_h.in @@ -21,8 +21,6 @@ #define PARROT_MINOR_VERSION @MINOR@ #define PARROT_PATCH_VERSION @PATCH@ #define PARROT_ARCHNAME "@cpuarch@-@osname@" -#define PARROT_JIT_CAPABLE @jitcapable@ -#define PARROT_EXEC_CAPABLE @execcapable@ #define PARROT_SHARE_EXT "@share_ext@" #define PARROT_LOAD_EXT "@load_ext@" #define PARROT_OBJ_EXT "@o@" @@ -92,7 +90,6 @@ struct PackFile; typedef struct PackFile * Parrot_PackFile; #include #define PARROT_CPU_ARCH "@cpuarch@" -#define PARROT_OS_NAME "@jitosname@" #define PARROT_BYTEORDER 0x@byteorder@ #define PARROT_BIGENDIAN @bigendian@ @@ -141,15 +138,6 @@ typedef size_t ptrcast_t; typedef struct _vtable VTABLE; typedef void DPOINTER; -/* JIT and exec cores. */ -#define JIT_CPUARCH "@jitcpuarch@" -#define JIT_OSNAME "@jitosname@" -#define JIT_ARCHNAME "@jitarchname@" -#define JIT_CAPABLE @jitcapable@ -#define EXEC_CAPABLE @execcapable@ -#define PARROT_EXEC_OS_@jitosname@ 1 -#define PARROT_@jitcpu@ 1 - /* Oplib and dynamic ops related. */ #define PARROT_CORE_OPLIB_NAME "core_ops" #define PARROT_CORE_OPLIB_INIT Parrot_DynOp_core_@MAJOR@_@MINOR@_@PATCH@ diff --git a/config/gen/config_pm/myconfig.in b/config/gen/config_pm/myconfig.in index efecb66..4f2acf2 100644 --- a/config/gen/config_pm/myconfig.in +++ b/config/gen/config_pm/myconfig.in @@ -2,9 +2,6 @@ Summary of my parrot @VERSION@ (r@revision@) configuration: configdate='@configdate@' Platform: osname=@osname@, archname=@archname@ - jitcapable=@jitcapable@, jitarchname=@jitarchname@, - jitosname=@jitosname@, jitcpuarch=@jitcpuarch@ - execcapable=@execcapable@ perl=@perl@ Compiler: cc='@cc@', ccflags='@ccflags@', diff --git a/include/parrot/embed.h b/include/parrot/embed.h index 069216c..6168c9c 100644 --- a/include/parrot/embed.h +++ b/include/parrot/embed.h @@ -12,7 +12,7 @@ #include "parrot/core_types.h" /* types used */ #include "parrot/compiler.h" /* compiler capabilities */ -#include "parrot/config.h" /* PARROT_VERSION, PARROT_JIT_CAPABLE... */ +#include "parrot/config.h" /* PARROT_VERSION... */ #include "parrot/interpreter.h" /* give us the interpreter flags */ #include "parrot/warnings.h" /* give us the warnings flags */ diff --git a/include/parrot/extend.h b/include/parrot/extend.h index fca555f..9f99d55 100644 --- a/include/parrot/extend.h +++ b/include/parrot/extend.h @@ -15,7 +15,7 @@ #include #include "parrot/core_types.h" -#include "parrot/config.h" /* PARROT_VERSION, PARROT_JIT_CAPABLE... */ +#include "parrot/config.h" /* PARROT_VERSION... */ #include "parrot/interpreter.h" /* give us the interpreter flags */ #include "parrot/warnings.h" /* give us the warnings flags */ diff --git a/lib/Parrot/Configure/Options/Conf.pm b/lib/Parrot/Configure/Options/Conf.pm index ffe8aea..0f3a6da 100644 --- a/lib/Parrot/Configure/Options/Conf.pm +++ b/lib/Parrot/Configure/Options/Conf.pm @@ -90,8 +90,6 @@ Parrot Options: --opcode=(type) Use the given type for opcodes --ops=(files) Use the given ops files - --jitcapable Use JIT - --execcapable Use JIT to emit a native executable --without-threads Build parrot without thread support --buildframes Dynamically build NCI call frames --without-core-nci-thunks diff --git a/lib/Parrot/Configure/Options/Conf/Shared.pm b/lib/Parrot/Configure/Options/Conf/Shared.pm index 05ed095..a2c1b6c 100644 --- a/lib/Parrot/Configure/Options/Conf/Shared.pm +++ b/lib/Parrot/Configure/Options/Conf/Shared.pm @@ -26,7 +26,6 @@ our @shared_valid_options = qw{ define disable-rpath exec-prefix - execcapable fatal fatal-step floatval @@ -39,7 +38,6 @@ our @shared_valid_options = qw{ infodir inline intval - jitcapable buildframes ld ldflags diff --git a/lib/Parrot/Configure/Step/List.pm b/lib/Parrot/Configure/Step/List.pm index 02ef0fb..070bf48 100644 --- a/lib/Parrot/Configure/Step/List.pm +++ b/lib/Parrot/Configure/Step/List.pm @@ -35,7 +35,6 @@ my @steps = qw( auto::va_ptr auto::format auto::isreg - auto::jit auto::frames auto::llvm auto::inline diff --git a/runtime/parrot/library/distutils.pir b/runtime/parrot/library/distutils.pir index 792b322..6c8f31c 100644 --- a/runtime/parrot/library/distutils.pir +++ b/runtime/parrot/library/distutils.pir @@ -4216,8 +4216,6 @@ Return the whole config $S0 = $P0['ccwarn'] flags .= $S0 flags .= " " - $S0 = $P0['cc_hasjit'] - flags .= $S0 .return (flags) .end diff --git a/src/exceptions.c b/src/exceptions.c index fc8b207..5c873d3 100644 --- a/src/exceptions.c +++ b/src/exceptions.c @@ -714,7 +714,6 @@ describe them as well.\n\n"); fprintf(stderr, "Version : %s\n", PARROT_VERSION); fprintf(stderr, "Configured : %s\n", PARROT_CONFIG_DATE); fprintf(stderr, "Architecture: %s\n", PARROT_ARCHNAME); - fprintf(stderr, "JIT Capable : %s\n", JIT_CAPABLE ? "Yes" : "No"); if (interp) fprintf(stderr, "Interp Flags: %#x\n", (unsigned int)interp->flags); else diff --git a/t/examples/shootout.t b/t/examples/shootout.t index bdbcc2f..408fd2f 100644 --- a/t/examples/shootout.t +++ b/t/examples/shootout.t @@ -69,10 +69,8 @@ foreach my $script (@shootouts) { if ( $shebang =~ /^\#.+parrot\s+(.+)$/ ) { $args = $1; # parrot options } - unless ( $PConfig{jitcapable} ) { $args =~ s/-j/-C/; $args =~ s/-Cj/-C/; - } $args =~ s/-Cj/-j/; # Remove any plain -C option. diff --git a/t/native_pbc/integer.t b/t/native_pbc/integer.t index 3dc71c1..8972d39 100644 --- a/t/native_pbc/integer.t +++ b/t/native_pbc/integer.t @@ -173,7 +173,7 @@ sub test_pbc_integer { # ] test_pbc_integer(1, "(4_le) i386 32 bit opcode_t, 4 byte intval, 8 byte double"); -# adding --floatval="long double" --jitcapable=0 +# adding --floatval="long double" # HEADER => [ # wordsize = 4 (interpreter's wordsize/INTVAL = 4/4) # byteorder = 0 (interpreter's byteorder = 0) diff --git a/tools/dev/create_language.pl b/tools/dev/create_language.pl index 2a87378..fc7dc55 100644 --- a/tools/dev/create_language.pl +++ b/tools/dev/create_language.pl @@ -486,7 +486,7 @@ PARROT_LIBRARY_DIR = $(PARROT_LIB_DIR)/library HAS_ICU = @has_icu@ CC = @cc@ -CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ +CFLAGS = @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cg_flag@ @gc_flag@ EXE = @exe@ LD = @ld@ LDFLAGS = @ldflags@ @ld_debug@ diff --git a/tools/dev/mk_native_pbc b/tools/dev/mk_native_pbc index 1013610..628c56d 100755 --- a/tools/dev/mk_native_pbc +++ b/tools/dev/mk_native_pbc @@ -144,7 +144,7 @@ if [ "$enable_long_double" = "1" ]; then exit fi make -s prog-clean - perl Configure.pl --floatval="long double" --jitcapable=0 --nomanicheck + perl Configure.pl --floatval="long double" --nomanicheck tail myconfig make -s || exit 1 hugefloatvalsize=$(./parrot_config hugefloatvalsize)