diff -r -u parrot-current/config/auto/gcc.pm parrot-andy/config/auto/gcc.pm
--- parrot-current/config/auto/gcc.pm	2009-05-28 07:44:29.000000000 -0400
+++ parrot-andy/config/auto/gcc.pm	2009-05-28 08:59:36.000000000 -0400
@@ -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;
 }
 
diff -r -u parrot-current/src/multidispatch.c parrot-andy/src/multidispatch.c
--- parrot-current/src/multidispatch.c	2009-05-28 07:42:50.000000000 -0400
+++ parrot-andy/src/multidispatch.c	2009-05-28 08:59:04.000000000 -0400
@@ -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));
 
diff -r -u parrot-current/t/steps/auto_gcc-01.t parrot-andy/t/steps/auto_gcc-01.t
--- parrot-current/t/steps/auto_gcc-01.t	2009-05-28 07:43:59.000000000 -0400
+++ parrot-andy/t/steps/auto_gcc-01.t	2009-05-28 09:00:14.000000000 -0400
@@ -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");
 }