[svn:parrot] r41284 - in branches/kill_jit: config/auto tools/build

[darbelo at svn.parrot.org]

Author: darbelo
Date: Tue Sep 15 23:09:10 2009
New Revision: 41284
URL: https://trac.parrot.org/parrot/changeset/41284

Log:
Temporarily hijack the cc_hasjit flag for CAN_BUILD_CALL_FRAMES, this should re-enable JIT frames on platforms that had them pre-r41283.

Modified:
   branches/kill_jit/config/auto/jit.pm
   branches/kill_jit/tools/build/nativecall.pl

Modified: branches/kill_jit/config/auto/jit.pm
==============================================================================
--- branches/kill_jit/config/auto/jit.pm	Tue Sep 15 21:54:10 2009	(r41283)
+++ branches/kill_jit/config/auto/jit.pm	Tue Sep 15 23:09:10 2009	(r41284)
@@ -23,28 +23,36 @@
 use warnings;
 
 use base qw(Parrot::Configure::Step);
-#use Parrot::Configure::Utils qw(copy_if_diff);
 
 sub _init {
     my $self = shift;
     my %data;
     $data{description} = q{Determine JIT capability};
     $data{result}      = q{};
-
     return \%data;
 }
 
 sub runstep {
     my ( $self, $conf ) = @_;
 
+    my $osname  = $conf->data->get('osname');
+    my $cpuarch = $conf->data->get('cpuarch');
+    my $nvsize  = $conf->data->get('nvsize');
+
+    if ( $nvsize == 8 && $cpuarch eq 'i386' && $osname ne 'darwin' ) {
+        $conf->data->set( cc_hasjit => '-DCAN_BUILD_CALL_FRAMES' );
+    }
+    else {
+        $conf->data->set( cc_hasjit => '' );
+    }
+
     $conf->data->set(
         jitarchname    => 'nojit',
-        jitcpuarch     => $conf->data->get('cpuarch'),
-        jitcpu         => $conf->data->get('cpuarch'),
-        jitosname      => $conf->data->get('osname'),
+        jitcpuarch     => $cpuarch,
+        jitcpu         => $cpuarch,
+        jitosname      => $osname,
         jitcapable     => 0,
         execcapable    => 0,
-        cc_hasjit      => '',
         TEMP_jit_o     => '',
         TEMP_exec_h    => '',
         TEMP_exec_o    => '',

Modified: branches/kill_jit/tools/build/nativecall.pl
==============================================================================
--- branches/kill_jit/tools/build/nativecall.pl	Tue Sep 15 21:54:10 2009	(r41283)
+++ branches/kill_jit/tools/build/nativecall.pl	Tue Sep 15 23:09:10 2009	(r41284)
@@ -231,10 +231,9 @@
  * - if it returns NULL, the hardcoded version will do the job
  */
 
-#if defined(HAS_JIT) && defined(I386)
+#if defined(CAN_BUILD_CALL_FRAMES)
 #  include "parrot/exec.h"
 #  include "jit.h"
-#  define CAN_BUILD_CALL_FRAMES
 #endif
 
 /*