diff options
Diffstat (limited to 'main/mariadb/ppc-remove-glibc-dep.patch')
| -rw-r--r-- | main/mariadb/ppc-remove-glibc-dep.patch | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/main/mariadb/ppc-remove-glibc-dep.patch b/main/mariadb/ppc-remove-glibc-dep.patch index 72ae1d809e..3e9580ee02 100644 --- a/main/mariadb/ppc-remove-glibc-dep.patch +++ b/main/mariadb/ppc-remove-glibc-dep.patch @@ -27,12 +27,14 @@ directly was the first solution adopted in MariaDB [2]. --- a/storage/xtradb/include/ut0ut.h +++ b/storage/xtradb/include/ut0ut.h -@@ -86,8 +86,7 @@ +@@ -85,9 +85,8 @@ + the YieldProcessor macro defined in WinNT.h. It is a CPU architecture- independent way by using YieldProcessor. */ # define UT_RELAX_CPU() YieldProcessor() - # elif defined(__powerpc__) +-# elif defined(__powerpc__) && defined __GLIBC__ -#include <sys/platform/ppc.h> -# define UT_RELAX_CPU() __ppc_get_timebase() ++# elif defined(__powerpc__) +# define UT_RELAX_CPU() __builtin_ppc_get_timebase() # else # define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */ @@ -44,32 +46,34 @@ directly was the first solution adopted in MariaDB [2]. -#include <sys/platform/ppc.h> -# define UT_LOW_PRIORITY_CPU() __ppc_set_ppr_low() -# define UT_RESUME_PRIORITY_CPU() __ppc_set_ppr_med() -+# define UT_LOW_PRIORITY_CPU() __asm__ __volatile__ ("or 1,1,1") ++# define UT_LOW_PRIORITY_CPU() __asm__ __volatile__ ("or 1,1,1") +# define UT_RESUME_PRIORITY_CPU() __asm__ __volatile__ ("or 2,2,2") # else # define UT_LOW_PRIORITY_CPU() ((void)0) # define UT_RESUME_PRIORITY_CPU() ((void)0) --- a/storage/innobase/include/ut0ut.h +++ b/storage/innobase/include/ut0ut.h -@@ -89,8 +89,7 @@ +@@ -70,9 +70,8 @@ + the YieldProcessor macro defined in WinNT.h. It is a CPU architecture- independent way by using YieldProcessor. */ - # define UT_RELAX_CPU() YieldProcessor() - # elif defined(__powerpc__) --#include <sys/platform/ppc.h> --# define UT_RELAX_CPU() __ppc_get_timebase() -+# define UT_RELAX_CPU() __builtin_ppc_get_timebase() - # else - # define UT_RELAX_CPU() ((void)0) /* avoid warning for an empty statement */ - # endif -@@ -104,9 +103,8 @@ + # define UT_RELAX_CPU() YieldProcessor() +-#elif defined(__powerpc__) && defined __GLIBC__ +-# include <sys/platform/ppc.h> +-# define UT_RELAX_CPU() __ppc_get_timebase() ++#elif defined(__powerpc__) ++# define UT_RELAX_CPU() __builtin_ppc_get_timebase() + #else + # define UT_RELAX_CPU() do { \ + volatile int32 volatile_var; \ +@@ -90,9 +89,8 @@ #endif - # if defined(HAVE_HMT_PRIORITY_INSTRUCTION) --#include <sys/platform/ppc.h> --# define UT_LOW_PRIORITY_CPU() __ppc_set_ppr_low() --# define UT_RESUME_PRIORITY_CPU() __ppc_set_ppr_med() -+# define UT_LOW_PRIORITY_CPU() __asm__ __volatile__ ("or 1,1,1") -+# define UT_RESUME_PRIORITY_CPU() __asm__ __volatile__ ("or 2,2,2") - # else - # define UT_LOW_PRIORITY_CPU() ((void)0) - # define UT_RESUME_PRIORITY_CPU() ((void)0) + #if defined(HAVE_HMT_PRIORITY_INSTRUCTION) +-# include <sys/platform/ppc.h> +-# define UT_LOW_PRIORITY_CPU() __ppc_set_ppr_low() +-# define UT_RESUME_PRIORITY_CPU() __ppc_set_ppr_med() ++# define UT_LOW_PRIORITY_CPU() __asm__ __volatile__ ("or 1,1,1") ++# define UT_RESUME_PRIORITY_CPU() __asm__ __volatile__ ("or 2,2,2") + #else + # define UT_LOW_PRIORITY_CPU() ((void)0) + # define UT_RESUME_PRIORITY_CPU() ((void)0) |