Re: build fails

[Sam S. <sd...@gn...>]

Vladimir,

> * Vladimir Tzankov <igm...@tz...> [2011-05-17 22:48:52 +0300]:
>
> Following change in arilevel1.d causes the build to fail:
>      1.7 -#if (defined(MC680X0) || defined(SPARC) || (defined(I80386)
> && !defined(BORLAND)) || defined(MIPS) || defined(VAX) ||
> defined(ARM)) && !defined(NO_ARI_ASM)
>      1.8 +#if (defined(MC680X0) || defined(SPARC) || (defined(I80386)
> && defined(MIPS) || defined(VAX) || defined(ARM)) &&
> !defined(NO_ARI_ASM)
>
> There is missing bracket in the #ifdefs and while I've "fixed" it
> locally - can you have a look on it?

yes, the patch is broken. sorry!
the fix is attached.
I will fix the repo soon, you will need to clone it again.

EVERYONE, please do check the tip+this patch on your platform,
especially the obscure platforms like windows (I _cannot_ build on
windows, so it will be _your_ fault if clisp does not work there!)

thanks!

-- 
Sam Steingold (http://sds.podval.org/) on CentOS release 5.6 (Final) X 11.0.60900031
http://pmw.org.il http://mideasttruth.com http://truepeace.org
http://openvotingconsortium.org http://www.PetitionOnline.com/tap12009/
I'm out of my mind, but feel free to leave a message...


diff -r a1f5e51abd39 src/arilev0.d
--- a/src/arilev0.d	Tue May 17 14:57:12 2011 -0400
+++ b/src/arilev0.d	Tue May 17 16:17:57 2011 -0400
@@ -354,7 +354,7 @@
   #ifndef mulu32
     #define mulu32(x,y,hi_assignment,lo_assignment)  \
       { lo_assignment mulu32_(x,y); hi_assignment mulu32_high; }
-    #if defined(MC680X0) || defined(SPARC) || defined(SPARC64) || defined(ARM) || (defined(I80386) && defined(MIPS) || defined(HPPA) || defined(VAX)
+    #if defined(MC680X0) || defined(SPARC) || defined(SPARC64) || defined(ARM) || defined(I80386) || defined(MIPS) || defined(HPPA) || defined(VAX)
       # mulu32_ extern in Assembler
       #if defined(SPARC) || defined(SPARC64)
         #define mulu32_high  (uint32)(_get_g1()) # Rückgabe im Register %g1
@@ -932,7 +932,7 @@
   #ifndef divu_6432_3232
     #define divu_6432_3232(xhi,xlo,y,q_assignment,r_assignment)  \
       { q_assignment divu_6432_3232_(xhi,xlo,y); r_assignment divu_32_rest; }
-    #if defined(MC680Y0) || defined(SPARC) || defined(SPARC64) || defined(ARM) || (defined(I80386) && defined(HPPA)
+    #if defined(MC680Y0) || defined(SPARC) || defined(SPARC64) || defined(ARM) || defined(I80386) || defined(HPPA)
       # divu_6432_3232_ extern in Assembler
       #if defined(SPARC) || defined(SPARC64)
         #define divu_32_rest  (uint32)(_get_g1()) # Rückgabe im Register %g1
diff -r a1f5e51abd39 src/arilev1.d
--- a/src/arilev1.d	Tue May 17 14:57:12 2011 -0400
+++ b/src/arilev1.d	Tue May 17 16:17:57 2011 -0400
@@ -203,7 +203,7 @@ typedef struct { uintD* MSDptr; uintC le
 #                   as macroexpanded inline assembler routines.
 #                   Very efficient.
 
-#if (defined(MC680X0) || defined(SPARC) || (defined(I80386) && defined(MIPS) || defined(VAX) || defined(ARM)) && !defined(NO_ARI_ASM)
+#if (defined(MC680X0) || defined(SPARC) || defined(I80386) || defined(MIPS) || defined(VAX) || defined(ARM)) && !defined(NO_ARI_ASM)
   # diese Assembler beherrsche ich
   #if (defined(GNU) && defined(WANT_LOOP_INLINE))
     # der GNU-Compiler kann Inline-Assembler