Add a new support_x32 patch (#833541).

Avoid picking up wrong inline assembly.

diff --git a/debian/changelog b/debian/changelog
index 8ff370ede43ec6dfef35f9fb86a19ba8be878669..6aeb28b86b25690eb0ab8431ec7bc8f4ce133a3e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ ncbi-blast+ (2.4.0-3) UNRELEASED; urgency=medium
     (Closes: #833538.)
   * Reinstate and refresh the hurd_fixes patch, which mostly still applies.
     (Closes: #833539.)
+  * Add a new support_x32 patch to avoid picking up wrong inline assembly.
+    (Closes: #833541.)
 
- -- Aaron M. Ucko <ucko@debian.org>  Fri, 05 Aug 2016 19:40:28 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Fri, 05 Aug 2016 19:42:47 -0400
 
 ncbi-blast+ (2.4.0-2) unstable; urgency=medium
 

diff --git a/debian/patches/series b/debian/patches/series
index 7b3674e6431831547de172845f259fa628869b27..2fd0e8c0c69f718d45deb31903b82dc538717ab2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ skip_services_unit_test
 fix_configure
 fix_version_extraction
 support_recent_boost
+support_x32

diff --git a/debian/patches/support_x32 b/debian/patches/support_x32
new file mode 100644 (file)
index 0000000..8c8874f
--- /dev/null
+++ b/debian/patches/support_x32
@@ -0,0 +1,11 @@
+--- a/c++/include/corelib/impl/ncbi_atomic_defs.h
++++ b/c++/include/corelib/impl/ncbi_atomic_defs.h
+@@ -117,7 +117,7 @@ extern "C" {
+    ((defined(__i386) || defined(__sparc) || defined(__x86_64))  &&  \
+     !defined(__GLIBCPP__) /* < 3.0 or >= 3.4 */)  &&  \
+    (!defined(__GLIBCXX__)  ||  !defined(NCBI_TCHECK)))
+-#  if defined(__x86_64)
++#  if defined(__x86_64)  &&  !defined(_ILP32)
+ #    define NCBI_COUNTER_64_BIT
+ #  endif
+ #  ifdef NCBI_COUNTER_64_BIT