stdlib: Remove longlong.h

The gmp-arch.h now provides all the required definitions.

soft-fp/soft-fp.h

@@ -327,8 +327,6 @@
 # ifdef _LIBC
 #  include <gmp.h>
 #  include <stdlib/gmp-impl.h>
-#  include <stdlib/longlong.h>
-#  include <gmp-arch.h>
 # else
 #  include "longlong.h"
 # endif

stdio-common/_itoa.c

@@ -25,8 +25,6 @@
 #include <gmp.h>
 #include <limits.h>
 #include <stdlib/gmp-impl.h>
-#include <stdlib/longlong.h>
-#include <gmp-arch.h>
 
 #include <_itoa.h>
 

stdio-common/_itowa.c

@@ -20,8 +20,6 @@
 #include <gmp.h>
 #include <limits.h>
 #include <stdlib/gmp-impl.h>
-#include <stdlib/longlong.h>
-#include <gmp-arch.h>
 
 #include <_itowa.h>
 

stdlib/Makefile

@@ -499,7 +499,6 @@ mpn-headers = \
   gmp-impl.h \
   gmp-mparam.h \
   gmp.h \
-  longlong.h \
   # mpn-headers
 
 routines := \

stdlib/addmul_1.c

@@ -23,8 +23,6 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
 
 #include <gmp.h>
 #include "gmp-impl.h"
-#include "longlong.h"
-#include <gmp-arch.h>
 
 mp_limb_t
 mpn_addmul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr,

stdlib/divmod_1.c

@@ -27,8 +27,6 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
 #include <gmp.h>
 #include <stdbit.h>
 #include "gmp-impl.h"
-#include "longlong.h"
-#include <gmp-arch.h>
 
 #ifndef UMUL_TIME
 #define UMUL_TIME 1

stdlib/divrem.c

@@ -21,7 +21,6 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
 
 #include <gmp.h>
 #include "gmp-impl.h"
-#include "longlong.h"
 
 /* Divide num (NP/NSIZE) by den (DP/DSIZE) and write
    the NSIZE-DSIZE least significant quotient limbs at QP

stdlib/gmp-impl.h

@@ -298,6 +298,8 @@ typedef unsigned int UHWtype;
 #define impn_sqr_n_basecase	__MPN(impn_sqr_n_basecase)
 #define impn_sqr_n		__MPN(impn_sqr_n)
 
+#include <gmp-arch.h>
+
 #ifndef _PROTO
 #if defined (__STDC__) || defined (__cplusplus)
 #define _PROTO(x) x

stdlib/mod_1.c

@@ -24,8 +24,6 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
 #include <gmp.h>
 #include <stdbit.h>
 #include "gmp-impl.h"
-#include "longlong.h"
-#include <gmp-arch.h>
 
 #ifndef UMUL_TIME
 #define UMUL_TIME 1

stdlib/mul_1.c

@@ -21,8 +21,6 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
 
 #include <gmp.h>
 #include "gmp-impl.h"
-#include "longlong.h"
-#include <gmp-arch.h>
 
 mp_limb_t
 mpn_mul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr,

stdlib/strtod_l.c

@@ -82,8 +82,6 @@ extern double ____strtod_l_internal (const char *, char **, int, locale_t);
 #include <gmp-mparam.h>
 #include <gmp.h>
 #include "gmp-impl.h"
-#include "longlong.h"
-#include "gmp-arch.h"
 #include "fpioconst.h"
 
 #include <assert.h>

stdlib/submul_1.c

@@ -23,8 +23,6 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
 
 #include <gmp.h>
 #include "gmp-impl.h"
-#include "longlong.h"
-#include <gmp-arch.h>
 
 mp_limb_t
 mpn_submul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr,

sysdeps/generic/gmp-arch.h

@@ -53,7 +53,6 @@ umul_ppmm_generic (mp_limb_t *w1, mp_limb_t *w0, mp_limb_t u, mp_limb_t v)
   *w0 = u128_low (r);
 #endif
 }
-#undef umul_ppmm
 #define umul_ppmm(__w1, __w0, __u, __v)			\
   ({							\
     __typeof (__w0) __w0t;				\
@@ -117,9 +116,7 @@ udiv_qrnnd_generic (mp_limb_t *q, mp_limb_t *r, mp_limb_t n1, mp_limb_t n0,
   *q = q1 * LL_B | q0;
   *r = r0;
 }
-# undef UDIV_NEEDS_NORMALIZATION
 # define UDIV_NEEDS_NORMALIZATION 1
-# undef udiv_qrnnd
 # define udiv_qrnnd(__q, __r, __n1, __n0, __d) \
   udiv_qrnnd_generic (&__q, &__r, __n1, __n0, __d)
 #endif
@@ -147,7 +144,6 @@ add_ssaaaa_generic (mp_limb_t *sh, mp_limb_t *sl, mp_limb_t ah,
   *sl = u128_low (r);
 #endif
 }
-#undef add_ssaaaa
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
   add_ssaaaa_generic (&sh, &sl, ah, al, bh, bl)
 
@@ -174,7 +170,6 @@ sub_ddmmss_generic (mp_limb_t *sh, mp_limb_t *sl, mp_limb_t ah,
   *sl = u128_low (r);
 #endif
 }
-#undef sub_ddmmss
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
   sub_ddmmss_generic (&sh, &sl, ah, al, bh, bl)
 

sysdeps/ieee754/dbl-64/dbl2mpn.c

@@ -17,8 +17,6 @@
 
 #include "gmp.h"
 #include "gmp-impl.h"
-#include "longlong.h"
-#include <gmp-arch.h>
 #include <ieee754.h>
 #include <float.h>
 #include <stdlib.h>

sysdeps/ieee754/ldbl-128/ldbl2mpn.c

@@ -17,8 +17,6 @@
 
 #include "gmp.h"
 #include "gmp-impl.h"
-#include "longlong.h"
-#include <gmp-arch.h>
 #include <ieee754.h>
 #include <float.h>
 #include <math.h>

sysdeps/ieee754/ldbl-128ibm/ldbl2mpn.c

@@ -17,7 +17,6 @@
 
 #include "gmp.h"
 #include "gmp-impl.h"
-#include "longlong.h"
 #include <ieee754.h>
 #include <float.h>
 #include <math.h>

sysdeps/ieee754/ldbl-96/ldbl2mpn.c

@@ -17,8 +17,6 @@
 
 #include "gmp.h"
 #include "gmp-impl.h"
-#include "longlong.h"
-#include <gmp-arch.h>
 #include <ieee754.h>
 #include <float.h>
 #include <math.h>

sysdeps/wordsize-32/divdi3.c

@@ -33,8 +33,6 @@
 
 #include <gmp.h>
 #include <stdlib/gmp-impl.h>
-#include <stdlib/longlong.h>
-#include <gmp-arch.h>
 
 #if __BYTE_ORDER == __BIG_ENDIAN
 struct DWstruct { Wtype high, low;};

sysdeps/x86/gmp-arch.h

@@ -41,9 +41,7 @@ udiv_qrnnd_x86 (mp_limb_t *q, mp_limb_t *r, mp_limb_t n1, mp_limb_t n0,
 	 "rm" (d));
 #endif
 }
-#undef UDIV_NEEDS_NORMALIZATION
 #define UDIV_NEEDS_NORMALIZATION 0
-#undef udiv_qrnnd
 #define udiv_qrnnd(__q, __r, __n1, __n0, __d) \
   udiv_qrnnd_x86 (&__q, &__r, __n1, __n0, __d)
 

sysdeps/x86/ldbl2mpn.c

@@ -17,8 +17,6 @@
 
 #include "gmp.h"
 #include "gmp-impl.h"
-#include "longlong.h"
-#include <gmp-arch.h>
 #include <ieee754.h>
 #include <float.h>
 #include <stdlib.h>