cvsuser 04/10/20 01:03:19
Modified: config/auto jit.pl memalign.pl
config/auto/memalign test_c.in test_c2.in
Log:
Re: Problems with 0.1.1 release on x86-64
Configure fixes for x86-64
Courtesy of Brian Wheeler <[EMAIL PROTECTED]>
Revision Changes Path
1.34 +4 -4 parrot/config/auto/jit.pl
Index: jit.pl
===================================================================
RCS file: /cvs/public/parrot/config/auto/jit.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -r1.33 -r1.34
--- jit.pl 8 Mar 2004 08:49:05 -0000 1.33
+++ jit.pl 20 Oct 2004 08:03:13 -0000 1.34
@@ -1,5 +1,5 @@
# Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-# $Id: jit.pl,v 1.33 2004/03/08 08:49:05 brentdax Exp $
+# $Id: jit.pl,v 1.34 2004/10/20 08:03:13 leo Exp $
=head1 NAME
@@ -171,9 +171,9 @@
else {
Configure::Data->set(
jitarchname => 'nojit',
- jitcpuarch => 'i386',
- jitcpu => 'I386',
- jitosname => 'nojit',
+ jitcpuarch => $cpuarch,
+ jitcpu => $cpuarch,
+ jitosname => $osname,
jitcapable => 0,
execcapable => 0,
cc_hasjit => '',
1.11 +8 -1 parrot/config/auto/memalign.pl
Index: memalign.pl
===================================================================
RCS file: /cvs/public/parrot/config/auto/memalign.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- memalign.pl 13 Oct 2004 14:37:59 -0000 1.10
+++ memalign.pl 20 Oct 2004 08:03:13 -0000 1.11
@@ -1,5 +1,5 @@
# Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-# $Id: memalign.pl,v 1.10 2004/10/13 14:37:59 leo Exp $
+# $Id: memalign.pl,v 1.11 2004/10/20 08:03:13 leo Exp $
=head1 NAME
@@ -42,6 +42,13 @@
Configure::Data->set('malloc_header', 'stdlib.h');
}
+ if (Configure::Data->get('ptrsize') == Configure::Data->get('intsize')) {
+ Configure::Data->set('ptrcast','int');
+ }
+ else {
+ Configure::Data->set('ptrcast','long');
+ }
+
cc_gen('config/auto/memalign/test_c.in');
eval { cc_build(); };
unless ($@ || cc_run_capture() !~ /ok/) {
1.5 +1 -1 parrot/config/auto/memalign/test_c.in
Index: test_c.in
===================================================================
RCS file: /cvs/public/parrot/config/auto/memalign/test_c.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- test_c.in 13 Jul 2003 18:52:37 -0000 1.4
+++ test_c.in 20 Oct 2004 08:03:19 -0000 1.5
@@ -9,6 +9,6 @@
int main(int argc, char **argv) {
void *ptr = memalign(256, 17);
- puts(ptr && ((int)ptr & 0xff) == 0 ? "ok" : "nix");
+ puts(ptr && ((${ptrcast})ptr & 0xff) == 0 ? "ok" : "nix");
return 0;
}
1.4 +1 -1 parrot/config/auto/memalign/test_c2.in
Index: test_c2.in
===================================================================
RCS file: /cvs/public/parrot/config/auto/memalign/test_c2.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- test_c2.in 13 Jul 2003 18:52:37 -0000 1.3
+++ test_c2.in 20 Oct 2004 08:03:19 -0000 1.4
@@ -20,6 +20,6 @@
* arbitrary allocation size)
*/
int i = posix_memalign(&p, s, 177);
- puts(((int)p & 0xff) == 0 && i == 0 ? "ok" : "nix");
+ puts(((${ptrcast})p & 0xff) == 0 && i == 0 ? "ok" : "nix");
return i;
}
