From 11080ed070e6edc3ae89b92d6780e8e3f2ea8853 Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Wed, 8 Aug 2001 18:52:23 +0000 Subject: [PATCH] - added some missing `&& !defined(NO_ASM)' in Sparc-#if's. --- src/base/cl_low.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/base/cl_low.h b/src/base/cl_low.h index bf795c9..a5f96a6 100644 --- a/src/base/cl_low.h +++ b/src/base/cl_low.h @@ -187,7 +187,7 @@ inline uint32 mulu32_unchecked (uint32 arg1, uint32 arg2) ); return _prod; } -#elif defined(__sparc__) +#elif defined(__sparc__) && !defined(NO_ASM) extern "C" uint32 mulu32_unchecked (uint32 x, uint32 y); // extern in Assembler #else // Wir können dafür auch die Bibliotheksroutine des C-Compilers nehmen: @@ -244,7 +244,7 @@ inline uint32 mulu32_unchecked (uint32 arg1, uint32 arg2) ); \ hi_zuweisung (uint32)_hi; lo_zuweisung (uint32)_lo; \ }) -#elif defined(__GNUC__) && defined(__sparc__) +#elif defined(__GNUC__) && defined(__sparc__) && !defined(NO_ASM) #define mulu32(x,y,hi_zuweisung,lo_zuweisung) \ ({ lo_zuweisung mulu32_(x,y); /* extern in Assembler */ \ {var register uint32 _hi __asm__("%g1"); \ @@ -666,7 +666,7 @@ inline uint32 mulu32_unchecked (uint32 arg1, uint32 arg2) q_zuweisung (uint32)__q; \ r_zuweisung (uint32)__r; \ }) -#elif defined(__GNUC__) && (defined(__sparc__) || defined(__sparc64__)) +#elif defined(__GNUC__) && (defined(__sparc__) || defined(__sparc64__)) && !defined(NO_ASM) #define divu_6432_3232(xhi,xlo,y,q_zuweisung,r_zuweisung) \ ({ var uint32 _q = divu_6432_3232_(xhi,xlo,y); /* extern in Assembler */\ var register uint32 _r __asm__("%g1"); \