[flint] 01/02: Remove git-dpm.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository flint.

commit cfd85952ee6d45a2545cbcd53ebc35935fa5b0b9
Author: Tobias Hansen <thansen at debian.org>
Date:   Wed Dec 21 00:09:37 2016 +0000

    Remove git-dpm.
---
 Makefile.subdirs            |  2 +-
 debian/.git-dpm             |  8 --------
 flint.h                     |  2 +-
 fmpz_poly/doc/fmpz_poly.txt |  2 +-
 longlong.h                  | 37 -------------------------------------
 5 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/Makefile.subdirs b/Makefile.subdirs
index f2d8b37..ec05fb0 100644
--- a/Makefile.subdirs
+++ b/Makefile.subdirs
@@ -59,7 +59,7 @@ $(BUILD_DIR)/$(MOD_DIR)_%.o: %.c
 	$(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
 
 $(MOD_LOBJ): $(LOBJS)
-	$(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
+	$(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
 
 -include $(LOBJS:.lo=.d)
 
diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 0487d3e..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,8 +0,0 @@
-# see git-dpm(1) from git-dpm package
-16700d91bc15d90fa2b82f5c7c2cac0608d48b3c
-16700d91bc15d90fa2b82f5c7c2cac0608d48b3c
-02ca7bf2912a1e1b0335e212f43ca8339b51b4fe
-02ca7bf2912a1e1b0335e212f43ca8339b51b4fe
-flint_2.5.2.orig.tar.gz
-2da845ada7521bfdec245f58d2053ce4258e230d
-2158692
diff --git a/flint.h b/flint.h
index 98c30d9..b1a3250 100644
--- a/flint.h
+++ b/flint.h
@@ -35,7 +35,7 @@
 #include <mpfr.h>
 #include <stdio.h>
 #include <stdlib.h> /* for alloca on FreeBSD */
-#if (!defined(BSD) && !defined(__MINGW64__) && !defined(__MINGW32__) && !defined(_MSC_VER)) || defined(__GNU__)
+#if !defined(BSD) && !defined(__MINGW64__) && !defined(__MINGW32__) && !defined(_MSC_VER)
 /* MinGW and FreeBSD have alloca, but not alloca.h */
 #include <alloca.h>
 #endif
diff --git a/fmpz_poly/doc/fmpz_poly.txt b/fmpz_poly/doc/fmpz_poly.txt
index 4f12e20..4d273dd 100644
--- a/fmpz_poly/doc/fmpz_poly.txt
+++ b/fmpz_poly/doc/fmpz_poly.txt
@@ -2985,7 +2985,7 @@ void fmpz_poly_bound_roots(fmpz_t bound, const fmpz_poly_t poly)
     $$
     2 \max \left(
         \left|\frac{a_{n-1}}{a_n}\right|,
-        \left|\frac{a_{n-2}}{a_n}\right|^{\frac{1}{2}}, \dotsc
+        \left|\frac{a_{n-2}}{a_n}\right|^{\frac{1}{2}}, \dots
         \left|\frac{a_1}{a_n}\right|^{\frac{1}{n-1}},
         \left|\frac{a_0}{2a_n}\right|^{\frac{1}{n}}
     \right)
diff --git a/longlong.h b/longlong.h
index 2c6d6d3..7fcb546 100644
--- a/longlong.h
+++ b/longlong.h
@@ -324,39 +324,6 @@
 
 #endif
 
-/* MIPS */
-#if (defined (__mips__) || defined (__arm__))
-
-#ifdef _LONG_LONG_LIMB
-#define count_leading_zeros(count,x)            \
-  do {                                          \
-    FLINT_ASSERT ((x) != 0);                    \
-    (count) = __builtin_clzll (x);              \
-  } while (0)
-#else
-#define count_leading_zeros(count,x)            \
-  do {                                          \
-    FLINT_ASSERT ((x) != 0);                    \
-    (count) = __builtin_clzl (x);               \
-  } while (0)
-#endif
-
-#ifdef _LONG_LONG_LIMB
-#define count_trailing_zeros(count,x)           \
-  do {                                          \
-    FLINT_ASSERT ((x) != 0);                    \
-    (count) = __builtin_ctzll (x);              \
-  } while (0)
-#else
-#define count_trailing_zeros(count,x)           \
-  do {                                          \
-    FLINT_ASSERT ((x) != 0);                    \
-    (count) = __builtin_ctzl (x);               \
-  } while (0)
-#endif
-
-#endif /* MIPS */
-
 #define udiv_qrnnd_int(q, r, n1, n0, d)                                \
   do {									                                      \
     mp_limb_t __d1, __d0, __q1, __q0, __r1, __r0, __m;			        \
@@ -397,7 +364,6 @@
     (r) = __r0;								                                \
   } while (0)
 
-#ifndef count_leading_zeros
 #define count_leading_zeros(count, x)                        \
   do {									                            \
     mp_limb_t __xr = (x);							                \
@@ -420,11 +386,9 @@
 									                                  \
     (count) = GMP_LIMB_BITS + 1 - __a - __flint_clz_tab[__xr >> __a]; \
   } while (0)
-#endif
 
 #if !(GMP_LIMB_BITS == 64 && defined (__ia64))
 
-#ifndef count_trailing_zeros
 #define count_trailing_zeros(count, x)                 \
   do {									                      \
     mp_limb_t __ctz_x = (x);						          \
@@ -433,7 +397,6 @@
     count_leading_zeros (__ctz_c, __ctz_x & -__ctz_x); \
     (count) = GMP_LIMB_BITS - 1 - __ctz_c;	 \
   } while (0)
-#endif
 
 #endif
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/flint.git