[svn:parrot] r39219 - in trunk: config/auto src t/steps

[Infinoid at svn.parrot.org]

Author: Infinoid
Date: Thu May 28 13:38:04 2009
New Revision: 39219
URL: https://trac.parrot.org/parrot/changeset/39219

Log:
[config] Apply patch from doughera++ in TT #716.
Remove a faulty alignment constraint which breaks on linux/ia64.

Modified:
   trunk/config/auto/gcc.pm
   trunk/src/multidispatch.c
   trunk/t/steps/auto_gcc-01.t

Modified: trunk/config/auto/gcc.pm
==============================================================================
--- trunk/config/auto/gcc.pm	Thu May 28 13:37:55 2009	(r39218)
+++ trunk/config/auto/gcc.pm	Thu May 28 13:38:04 2009	(r39219)
@@ -93,11 +93,7 @@
     $conf->data->set(
         ccwarn              => "$ccwarn",
         gccversion          => $gccversion,
-        HAS_aligned_funcptr => 1
     );
-    $conf->data->set( HAS_aligned_funcptr => 0 )
-        if (  $conf->data->get_p5('OSNAME') eq 'hpux'
-           || $conf->data->get('archname') =~ /gnulp/); # lpia arch
     return 1;
 }
 

Modified: trunk/src/multidispatch.c
==============================================================================
--- trunk/src/multidispatch.c	Thu May 28 13:37:55 2009	(r39218)
+++ trunk/src/multidispatch.c	Thu May 28 13:38:04 2009	(r39219)
@@ -1356,10 +1356,6 @@
         /* Create an NCI sub for the C function */
         PMC    *sub_obj       = constant_pmc_new(interp, enum_class_NCI);
 
-#ifdef PARROT_HAS_ALIGNED_FUNCPTR
-        PARROT_ASSERT((PTR2UINTVAL(func_ptr) & 3) == 0);
-#endif
-
         VTABLE_set_pointer_keyed_str(interp, sub_obj, short_sig,
                                      F2DPTR(func_ptr));
 

Modified: trunk/t/steps/auto_gcc-01.t
==============================================================================
--- trunk/t/steps/auto_gcc-01.t	Thu May 28 13:37:55 2009	(r39218)
+++ trunk/t/steps/auto_gcc-01.t	Thu May 28 13:38:04 2009	(r39219)
@@ -5,7 +5,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 123;
+use Test::More tests => 122;
 use Carp;
 use lib qw( lib t/configure/testlib );
 use_ok('config::init::defaults');
@@ -288,8 +288,6 @@
         "gccversion defined as expected");
     is($conf->data->get( 'gccversion' ), q{3.1},
         "Got expected value for gccversion");
-    is($conf->data->get( 'HAS_aligned_funcptr' ), 0,
-        "Got expected value for HAS_aligned_funcptr");
     like($step->result(), qr/^yes/, "Got expected result");
 }