[libntl] 06/12: Remove obsolete patch (MIPS and gcc 4.5)

Julien Puydt julien.puydt at laposte.net
Wed Aug 30 20:27:45 UTC 2017


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

jpuydt-guest pushed a commit to branch master
in repository libntl.

commit 3091cbe098f960dd09028aeb200b61d247da34ee
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Wed Aug 30 21:38:32 2017 +0200

    Remove obsolete patch (MIPS and gcc 4.5)
---
 debian/changelog                       |  1 +
 debian/patches/0001-gcc-4.5-mips.patch | 48 ----------------------------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82549bc..1f848a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ntl (10.5.0-1) UNRELEASED; urgency=medium
   * Bump dh compat to 10.
   * Bump std-ver to 4.0.1.
   * Bump d/watch to version 4.
+  * Remove obsolete patch (MIPS and gcc 4.5)
 
  -- Julien Puydt <julien.puydt at laposte.net>  Wed, 30 Aug 2017 21:30:38 +0200
 
diff --git a/debian/patches/0001-gcc-4.5-mips.patch b/debian/patches/0001-gcc-4.5-mips.patch
deleted file mode 100644
index 12d881e..0000000
--- a/debian/patches/0001-gcc-4.5-mips.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 8bda5c157d05c8c2f355fa17cc06091b7d66c5eb Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurel32 at debian.org>
-Date: Sun, 17 Apr 2011 23:41:31 +0200
-Subject: gcc-4.5-mips
-
-Bug-Debian: 623162
-
-Since GCC 4.4 it's not possible anymore to use the 'h' constraints for
-MIPS inline assembly code when doing a multiplication. That's why sprng
-fails to build from source on mips and mipsel.
-
-That said GCC supports 32x32 => 64 multiplication on 32-bit architecture
-for a lot of time, so there is no need to use assembly code for that.
-The patch below fixes the problem by using standard multiplication
-instead of assembly code. I have also included the code for MIPS64 using
-128-bit hints for reference (the second hunk), though it is not used in
-Debian.
----
- include/NTL/SPMM_ASM.h | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/include/NTL/SPMM_ASM.h b/include/NTL/SPMM_ASM.h
-index f38d274..17849ee 100644
---- a/include/NTL/SPMM_ASM.h
-+++ b/include/NTL/SPMM_ASM.h
-@@ -150,8 +150,8 @@ static inline unsigned long MulHiUL(unsigned long a, unsigned long b)
- 
- static inline unsigned long MulHiUL(unsigned long a, unsigned long b)
- {
--   unsigned long hi, lo;
--   __asm__ ("multu %2,%3" : "=l" (lo), "=h" (hi) : "d" (a), "d" (b));
-+   unsigned long hi;
-+   hi = ((unsigned long long) a * b) >> 32;
-    return hi;
- } 
- 
-@@ -162,8 +162,9 @@ static inline unsigned long MulHiUL(unsigned long a, unsigned long b)
- 
- static inline unsigned long MulHiUL(unsigned long a, unsigned long b)
- {
--   unsigned long hi, lo;
--   __asm__ ("dmultu %2,%3" : "=l" (lo), "=h" (hi) : "d" (a), "d" (b));
-+   typedef unsigned int uint128_t __attribute__((mode(TI)));
-+   unsigned long hi;
-+   hi = ((uint128_t) a * b) >> 64;
-    return hi;
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 3e902f8..3c7e396 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-gcc-4.5-mips.patch
 0002-Fix-typos.patch

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



More information about the debian-science-commits mailing list