[Pkg-mysql-commits] r2233 - in mysql-5.5/branches/unstable/debian: . patches

[Clint Byrum]

tags 719196 pending
thanks

Author: spamaps-guest
Date: 2013-08-10 03:35:23 +0000 (Sat, 10 Aug 2013)
New Revision: 2233

Added:
   mysql-5.5/branches/unstable/debian/patches/fix-mips64el-ftbfs.patch
Modified:
   mysql-5.5/branches/unstable/debian/changelog
   mysql-5.5/branches/unstable/debian/patches/series
Log:
d/patches/fix-mips64el-ftbfs.patch: Fix FTBFS on mips64el.
(Closes: #719196) Thanks YunQuiang Su.

Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog	2013-06-21 10:11:52 UTC (rev 2232)
+++ mysql-5.5/branches/unstable/debian/changelog	2013-08-10 03:35:23 UTC (rev 2233)
@@ -2,6 +2,8 @@
 
   * d/rules, d/control: Remove gcc-4.4 dependency and disable X86
     assembly in taocrypt. (Closes: #707280) (Closes: #678252)
+  * d/patches/fix-mips64el-ftbfs.patch: Fix FTBFS on mips64el.
+    (Closes: #719196) Thanks YunQuiang Su.
 
  -- Clint Byrum <clint at ubuntu.com>  Wed, 08 May 2013 13:11:27 -0700
 

Added: mysql-5.5/branches/unstable/debian/patches/fix-mips64el-ftbfs.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/fix-mips64el-ftbfs.patch	                        (rev 0)
+++ mysql-5.5/branches/unstable/debian/patches/fix-mips64el-ftbfs.patch	2013-08-10 03:35:23 UTC (rev 2233)
@@ -0,0 +1,20 @@
+From: YunQiang Su <wzssyqa at gmail.com>
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719196
+Forwarded: yes, http://bugs.mysql.com/69978
+Description:
+  Assembly problem, using =l instead of =lc.
+  http://stackoverflow.com/questions/3652153/impossible-constraint-in-asm
+
+Index: mysql-5.5/extra/yassl/taocrypt/src/integer.cpp
+===================================================================
+--- mysql-5.5.orig/extra/yassl/taocrypt/src/integer.cpp	2013-08-08 18:22:54.008293778 +0800
++++ mysql-5.5/extra/yassl/taocrypt/src/integer.cpp	2013-08-08 19:22:53.416259452 +0800
+@@ -192,7 +192,7 @@
+                 "a" (a), "rm" (b) : "cc");
+ 
+         #elif defined(__mips64)
+-            __asm__("dmultu %2,%3" : "=h" (r.halfs_.high), "=l" (r.halfs_.low)
++            __asm__("dmultu %2,%3" : "=d" (r.halfs_.high), "=lc" (r.halfs_.low)
+                 : "r" (a), "r" (b));
+ 
+         #elif defined(_M_IX86)

Modified: mysql-5.5/branches/unstable/debian/patches/series
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/series	2013-06-21 10:11:52 UTC (rev 2232)
+++ mysql-5.5/branches/unstable/debian/patches/series	2013-08-10 03:35:23 UTC (rev 2233)
@@ -8,3 +8,4 @@
 94_spelling.patch
 regex_plus.patch
 versioned_symbols.patch
+fix-mips64el-ftbfs.patch