Ticket #716: tt716-remove-aligned-funcptr.patch

File tt716-remove-aligned-funcptr.patch, 1.9 KB (added by doughera, 13 years ago)
  • config/auto/gcc.pm

    diff -r -u parrot-current/config/auto/gcc.pm parrot-andy/config/auto/gcc.pm
    old new  
    9393    $conf->data->set( 
    9494        ccwarn              => "$ccwarn", 
    9595        gccversion          => $gccversion, 
    96         HAS_aligned_funcptr => 1 
    9796    ); 
    98     $conf->data->set( HAS_aligned_funcptr => 0 ) 
    99         if (  $conf->data->get_p5('OSNAME') eq 'hpux' 
    100            || $conf->data->get('archname') =~ /gnulp/); # lpia arch 
    10197    return 1; 
    10298} 
    10399 
  • src/multidispatch.c

    diff -r -u parrot-current/src/multidispatch.c parrot-andy/src/multidispatch.c
    old new  
    13561356        /* Create an NCI sub for the C function */ 
    13571357        PMC    *sub_obj       = constant_pmc_new(interp, enum_class_NCI); 
    13581358 
    1359 #ifdef PARROT_HAS_ALIGNED_FUNCPTR 
    1360         PARROT_ASSERT((PTR2UINTVAL(func_ptr) & 3) == 0); 
    1361 #endif 
    1362  
    13631359        VTABLE_set_pointer_keyed_str(interp, sub_obj, short_sig, 
    13641360                                     F2DPTR(func_ptr)); 
    13651361 
  • t/steps/auto_gcc-01.t

    diff -r -u parrot-current/t/steps/auto_gcc-01.t parrot-andy/t/steps/auto_gcc-01.t
    old new  
    55 
    66use strict; 
    77use warnings; 
    8 use Test::More tests => 123; 
     8use Test::More tests => 122; 
    99use Carp; 
    1010use lib qw( lib t/configure/testlib ); 
    1111use_ok('config::init::defaults'); 
     
    288288        "gccversion defined as expected"); 
    289289    is($conf->data->get( 'gccversion' ), q{3.1}, 
    290290        "Got expected value for gccversion"); 
    291     is($conf->data->get( 'HAS_aligned_funcptr' ), 0, 
    292         "Got expected value for HAS_aligned_funcptr"); 
    293291    like($step->result(), qr/^yes/, "Got expected result"); 
    294292} 
    295293