Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix el5-asm-compat.patch #5

Merged
merged 1 commit into from
Feb 23, 2016
Merged

fix el5-asm-compat.patch #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 15 additions & 21 deletions patches/el5-asm-compat.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
diff --git patches/asm-compat.patch patches/asm-compat.patch
new file mode 100644
index 0000000..2370776
--- /dev/null
+++ patches/asm-compat.patch
@@ -0,0 +1,15 @@
+diff -ru mariadb-10.1.9.orig/include/my_context.h mariadb-10.1.9/include/my_context.h
+--- mariadb-10.1.9.orig/include/my_context.h 2015-11-20 17:08:02.000000000 -0800
++++ mariadb-10.1.9/include/my_context.h 2016-01-27 00:26:50.000000000 -0800
+@@ -27,8 +27,10 @@
+
+ #ifdef __WIN__
+ #define MY_CONTEXT_USE_WIN32_FIBERS 1
+-#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__)
++#elif defined(__clang__)
+ #define MY_CONTEXT_USE_X86_64_GCC_ASM
++#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__)
++#define MY_CONTEXT_USE_UCONTEXT
+ #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
+ #define MY_CONTEXT_USE_I386_GCC_ASM
+ #elif defined(HAVE_UCONTEXT)
diff -ru mariadb-10.1.9.orig/include/my_context.h mariadb-10.1.9/include/my_context.h
--- mariadb-10.1.9.orig/include/my_context.h 2015-11-20 17:08:02.000000000 -0800
+++ mariadb-10.1.9/include/my_context.h 2016-01-27 00:26:50.000000000 -0800
@@ -27,8 +27,10 @@

#ifdef __WIN__
#define MY_CONTEXT_USE_WIN32_FIBERS 1
-#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__)
+#elif defined(__clang__)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is an EL5 patch how come there is a clang line here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume so it doesn't break OSX. It no worky-worky on el5 without this patch applied.

#define MY_CONTEXT_USE_X86_64_GCC_ASM
+#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && !defined(__ILP32__)
+#define MY_CONTEXT_USE_UCONTEXT
#elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__)
#define MY_CONTEXT_USE_I386_GCC_ASM
#elif defined(HAVE_UCONTEXT)