[packages/mysql/MYSQL_5_0] fix x32 stacktrace.c compile error

glen glen at pld-linux.org
Fri Sep 25 10:02:56 CEST 2015


commit 431f68fe79a66d5dfdd53f2655709e6c925fbc22
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Sep 25 11:01:56 2015 +0300

    fix x32 stacktrace.c compile error
    
    stacktrace.c:133: Error: operand type mismatch for `movq'
    
    this gives error on 5.0 branch, even if 5.6 branch has same code.
    just disable fp fetch for x32, this leaves no stacktraces on x32 platform, nothing else.

 x32.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
---
diff --git a/x32.patch b/x32.patch
index 10b73c2..c9da6d0 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,3 +1,14 @@
+--- mysql-5.0.96/sql/stacktrace.c~	2012-03-02 16:04:08.000000000 +0200
++++ mysql-5.0.96/sql/stacktrace.c	2015-09-25 11:00:15.206636982 +0300
+@@ -129,7 +129,7 @@
+ 		      :"=r"(fp)
+ 		      :"r"(fp));
+ #endif
+-#ifdef __x86_64__
++#if defined(__x86_64__) && !defined(__ILP32__)
+   __asm __volatile__ ("movq %%rbp,%0"
+ 		      :"=r"(fp)
+ 		      :"r"(fp));
 --- mysql-5.0.96/config/ac-macros/openssl.m4~	2012-03-02 16:04:12.000000000 +0200
 +++ mysql-5.0.96/config/ac-macros/openssl.m4	2015-09-25 10:47:31.053563769 +0300
 @@ -13,7 +13,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/431f68fe79a66d5dfdd53f2655709e6c925fbc22



More information about the pld-cvs-commit mailing list