Author: jkeenan Date: Sat Dec 1 19:59:22 2007 New Revision: 23331 Modified: trunk/config/auto/va_ptr.pm trunk/config/auto/va_ptr/test_c.in trunk/config/gen/config_h/feature_h.in
Log: Applying patch submitted in https://rt.perl.org/rt3/Ticket/Display.html?id=47313: "config/auto/va_ptr.pm delivering surprising result". Change mentions of 'PPC' to 'REGISTER' and 'X86' to 'STACK'. Modified: trunk/config/auto/va_ptr.pm ============================================================================== --- trunk/config/auto/va_ptr.pm (original) +++ trunk/config/auto/va_ptr.pm Sat Dec 1 19:59:22 2007 @@ -36,17 +36,17 @@ my $va_type; cc_gen('config/auto/va_ptr/test_c.in'); - eval { cc_build('-DVA_TYPE_X86'); }; + eval { cc_build('-DVA_TYPE_STACK'); }; if ( $@ || cc_run() !~ /^ok/ ) { - eval { cc_build('-DVA_TYPE_PPC'); }; + eval { cc_build('-DVA_TYPE_REGISTER'); }; if ( $@ || cc_run() !~ /^ok/ ) { die "Unknown va_ptr type"; } - $va_type = 'ppc'; + $va_type = 'register'; } else { - $va_type = 'x86'; + $va_type = 'stack'; } cc_clean(); $self->set_result($va_type); Modified: trunk/config/auto/va_ptr/test_c.in ============================================================================== --- trunk/config/auto/va_ptr/test_c.in (original) +++ trunk/config/auto/va_ptr/test_c.in Sat Dec 1 19:59:22 2007 @@ -1,10 +1,10 @@ #include <stdio.h> #include <stdarg.h> -#if defined VA_TYPE_PPC +#if defined VA_TYPE_REGISTER # define PARROT_VA_TO_VAPTR(x) (x) #endif -#if defined VA_TYPE_X86 +#if defined VA_TYPE_STACK # define PARROT_VA_TO_VAPTR(x) (&(x)) #endif Modified: trunk/config/gen/config_h/feature_h.in ============================================================================== --- trunk/config/gen/config_h/feature_h.in (original) +++ trunk/config/gen/config_h/feature_h.in Sat Dec 1 19:59:22 2007 @@ -73,13 +73,13 @@ /* from config/auto/va_ptr.pm: va_ptr_type => $va_result */ END_PRINT -if (@va_ptr_type@ eq 'ppc') { +if (@va_ptr_type@ eq 'register') { print OUT <<'END_PRINT'; /* if defined __powerpc__ || defined __x86_64__ || defined __s390__ */ # define PARROT_VA_TO_VAPTR(x) (x) END_PRINT } -if (@va_ptr_type@ eq 'x86') { +if (@va_ptr_type@ eq 'stack') { print OUT <<'END_PRINT'; # define PARROT_VA_TO_VAPTR(x) (&(x)) END_PRINT
