[Gmp-commit] /var/hg/gmp: Test LONGLONG_STANDALONE in two more places.

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/8d8745aa7375
changeset: 17162:8d8745aa7375
user:      Torbjorn Granlund <tg at gmplib.org>
date:      Tue Dec 13 19:20:31 2016 +0100
description:
Test LONGLONG_STANDALONE in two more places.

diffstat:

 longlong.h |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r 1173fd6297b7 -r 8d8745aa7375 longlong.h
--- a/longlong.h	Wed Dec 07 16:48:32 2016 +0100
+++ b/longlong.h	Tue Dec 13 19:20:31 2016 +0100
@@ -506,6 +506,7 @@
 	   : "r" ((USItype) (a)), "r" ((USItype) (b)) __CLOBBER_CC);	\
   } while (0)
 #define UMUL_TIME 20
+#ifndef LONGLONG_STANDALONE
 #define udiv_qrnnd(q, r, n1, n0, d) \
   do { UWtype __r;							\
     (q) = __MPN(udiv_qrnnd) (&__r, (n1), (n0), (d));			\
@@ -513,6 +514,7 @@
   } while (0)
 extern UWtype __MPN(udiv_qrnnd) (UWtype *, UWtype, UWtype, UWtype);
 #define UDIV_TIME 200
+#endif /* LONGLONG_STANDALONE */
 #else /* ARMv4 or newer */
 #define umul_ppmm(xh, xl, a, b) \
   __asm__ ("umull %0,%1,%2,%3" : "=&r" (xl), "=&r" (xh) : "r" (a), "r" (b))
@@ -2113,7 +2115,8 @@
 
 /* If the processor has no udiv_qrnnd but sdiv_qrnnd, go through
    __udiv_w_sdiv (defined in libgcc or elsewhere).  */
-#if !defined (udiv_qrnnd) && defined (sdiv_qrnnd)
+#if !defined (udiv_qrnnd) && defined (sdiv_qrnnd) \
+  && ! defined (LONGLONG_STANDALONE)
 #define udiv_qrnnd(q, r, nh, nl, d) \
   do {									\
     UWtype __r;								\