[Gm2] Debian/Alpha

[Michael Lambert]

Hi Gaius,

With Debian Etch on an Alpha I get

# of expected passes            6336
# of unexpected failures        30
# of unresolved testcases       6

after applying the patches below.  Using LONGCARD instead of CARDINAL  
on 64-bit architectures seems reasonable in subaddr.mod, but there may  
be some non-obvious reason not to do that.

Michael

----------
--- testsuite/gm2/cpp/pass/subaddr.mod.sav      2006-01-17  
16:45:21.000000000 -0500
+++ testsuite/gm2/cpp/pass/subaddr.mod  2008-10-24 21:40:33.000000000  
-0400
@@ -21,9 +21,13 @@

 VAR
    x, y: ADDRESS;
+#if defined(__x86_64) || (defined(__alpha__) && defined(__arch64__))  
|| defined(__LP64__)
+   i   : LONGCARD;
+BEGIN
+   i := LONGCARD(x - y)
+#else
    i   : CARDINAL;
 BEGIN
-#if !(defined(__x86_64) || (defined(__alpha__) && defined(__arch64__)))
    i := CARDINAL(x - y)
 #endif
 END subaddr.
----------

----------
--- testsuite/gm2/iso/pass/realbitscast.mod.sav 2008-10-22  
17:38:16.000000000 -0400
+++ testsuite/gm2/iso/pass/realbitscast.mod     2008-10-24  
22:39:37.000000000 -0400
@@ -26,7 +26,7 @@
     REAL32 = SHORTREAL;
     REAL64 = REAL;
 #if !defined(__sparc__) && !defined(__x86_64) && !defined(__ppc__)  
&& !defined(__ia64) && \
-    !(defined(__alpha__) && defined(__arch64__)) && ! 
(defined(__i386__) && defined(__APPLE__))
+    !(defined(__alpha__) && defined(__arch64__)) && ! 
(defined(__i386__) && defined(__APPLE__)) && !defined(__LP64__)
     REAL96 = LONGREAL ;  (* on the __sparc__ SIZE(LONGREAL) =  
SIZE(REAL) *)
     (* and on the x86_64 LONGREAL is 128 bits *)
     (* this is also true for at least some alphas *)
@@ -39,7 +39,7 @@
     r32 : REAL32;
     r64 : REAL64;
 #if !defined(__sparc__) && !defined(__x86_64) && !defined(__ppc__)  
&& !defined(__ia64) && \
-    !(defined(__alpha__) && defined(__arch64__)) && ! 
(defined(__i386__) && defined(__APPLE__))
+    !(defined(__alpha__) && defined(__arch64__)) && ! 
(defined(__i386__) && defined(__APPLE__)) && !defined(__LP64__)
     b96 : BITS96 ;
     r96 : REAL96 ;
 #endif
@@ -49,7 +49,7 @@
    b32 := CAST(BITS32,r32) ;
    b64 := CAST(BITS64,r64) ;
 #if !defined(__sparc__) && !defined(__x86_64) && !defined(__ppc__)  
&& !defined(__ia64) && \
-    !(defined(__alpha__) && defined(__arch64__)) && ! 
(defined(__i386__) && defined(__APPLE__))
+    !(defined(__alpha__) && defined(__arch64__)) && ! 
(defined(__i386__) && defined(__APPLE__)) && !defined(__LP64__)
    b96 := CAST(BITS96,r96)
 #endif
 END realbitscast.
----------