From e115636d8347fb696ff10406f5f0eca02d7481b0 Mon Sep 17 00:00:00 2001
From: jasonmoxham <jason@njkfrudils.plus.com>
Date: Sun, 23 Aug 2009 17:32:26 +0000
Subject: [PATCH] tweek macros

---
 bench/runbench | 2 +-
 gmp-impl.h     | 2 ++
 tune/common.c  | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bench/runbench b/bench/runbench
index 40736735..4853a87f 100755
--- a/bench/runbench
+++ b/bench/runbench
@@ -55,7 +55,7 @@ default=false
 
 if [ -z "$CFLAGS" ]
   then
-    CFLAGS="-O2 -fomit-frame-pointer -I$MPIR_DIR -include ${MPIR_NAME}.h"
+    CFLAGS="-m32 -O2 -fomit-frame-pointer -I$MPIR_DIR -include ${MPIR_NAME}.h"
     echo "Using default CFLAGS = \"$CFLAGS\""
     default=true
   else
diff --git a/gmp-impl.h b/gmp-impl.h
index a8d62f8a..5d48d702 100644
--- a/gmp-impl.h
+++ b/gmp-impl.h
@@ -1969,6 +1969,7 @@ mp_limb_t mpn_rshift2 _PROTO ((mp_ptr,mp_srcptr,mp_size_t));
 __GMP_DECLSPEC mp_limb_t mpn_addlsh1_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
 #elif HAVE_NATIVE_mpn_addlsh_n  
 #define mpn_addlsh1_n(__xp,__yp,__zp,__n) mpn_addlsh_n((__xp),(__yp),(__zp),(__n),1)
+#define HAVE_NATIVE_mpn_addlsh1_n
 #endif
 
 #if HAVE_NATIVE_mpn_sublsh1_n
@@ -1976,6 +1977,7 @@ __GMP_DECLSPEC mp_limb_t mpn_addlsh1_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcpt
 __GMP_DECLSPEC mp_limb_t mpn_sublsh1_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
 #elif HAVE_NATIVE_mpn_sublsh_n  
 #define mpn_sublsh1_n(__xp,__yp,__zp,__n) mpn_sublsh_n((__xp),(__yp),(__zp),(__n),1)
+#define HAVE_NATIVE_mpn_sublsh1_n
 #endif
 
 #if HAVE_NATIVE_mpn_inclsh_n
diff --git a/tune/common.c b/tune/common.c
index 5c86a7ae..1c71a5d2 100644
--- a/tune/common.c
+++ b/tune/common.c
@@ -898,14 +898,14 @@ speed_mpn_sublsh_n (struct speed_params *s)
 double
 speed_mpn_inclsh_n (struct speed_params *s)
 {
-  SPEED_ROUTINE_MPN_UNARY_1 (mpn_inclsh_n);
+  SPEED_ROUTINE_MPN_UNARY_1_CALL (mpn_inclsh_n(wp,s->xp,s->size,s->r));
 }
 #endif
 #if HAVE_NATIVE_mpn_declsh_n
 double
 speed_mpn_declsh_n (struct speed_params *s)
 {
-  SPEED_ROUTINE_MPN_UNARY_1 (mpn_declsh_n);
+  SPEED_ROUTINE_MPN_UNARY_1_CALL (mpn_declsh_n(wp,s->xp,s->size,s->r));
 }
 #endif
 #if HAVE_NATIVE_mpn_rsh1add_n