Commit 8c827e28 authored by lenz@mysql.com's avatar lenz@mysql.com

Added some patches provided by SuSE to fix build problems on

ppc64 and x86-64, fixed a compile bug when building with TCP wrapper
support on Linux
parent f07ddef7
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#undef HAVE_MUTEX_WIN16 #undef HAVE_MUTEX_WIN16
#undef HAVE_MUTEX_WIN32 #undef HAVE_MUTEX_WIN32
#undef HAVE_MUTEX_X86_GCC_ASSEMBLY #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
#undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
/* Define if building on QNX. */ /* Define if building on QNX. */
#undef HAVE_QNX #undef HAVE_QNX
......
...@@ -314,6 +314,18 @@ AC_TRY_RUN([main(){ ...@@ -314,6 +314,18 @@ AC_TRY_RUN([main(){
}], [db_cv_mutex="x86/gcc-assembly"]) }], [db_cv_mutex="x86/gcc-assembly"])
fi fi
dnl x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
if test "$db_cv_mutex" = no; then
AC_TRY_RUN([main(){
#if defined(x86_64) || defined(__x86_64__)
#if defined(__GNUC__)
exit(0);
#endif
#endif
exit(1);
}], [db_cv_mutex="x86_64/gcc-assembly"])
fi
dnl ia86/gcc: Linux dnl ia86/gcc: Linux
if test "$db_cv_mutex" = no; then if test "$db_cv_mutex" = no; then
AC_TRY_RUN([main(){ AC_TRY_RUN([main(){
......
...@@ -611,6 +611,28 @@ typedef unsigned char tsl_t; ...@@ -611,6 +611,28 @@ typedef unsigned char tsl_t;
#endif #endif
#endif #endif
#ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
typedef unsigned char tsl_t;
#ifdef LOAD_ACTUAL_MUTEX_CODE
/*
* For gcc/x86, 0 is clear, 1 is set.
*/
#define MUTEX_SET(tsl) ({ \
register tsl_t *__l = (tsl); \
int __r; \
asm volatile("mov $1,%%rax; lock; xchgb %1,%%al; xor $1,%%rax"\
: "=&a" (__r), "=m" (*__l) \
: "1" (*__l) \
); \
__r & 1; \
})
#define MUTEX_UNSET(tsl) (*(tsl) = 0)
#define MUTEX_INIT(tsl) MUTEX_UNSET(tsl)
#endif
#endif
/* /*
* Mutex alignment defaults to one byte. * Mutex alignment defaults to one byte.
* *
......
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
#endif #endif
/* In Linux-ia64 including atomic.h will give us an error */ /* In Linux-ia64 including atomic.h will give us an error */
#if (defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && defined(__ia64__)) || !defined(THREAD) #if (defined(HAVE_LINUXTHREADS) && defined(__GNUC__) && (defined(__ia64__) || defined(__powerpc64__))) || !defined(THREAD)
#undef HAVE_ATOMIC_ADD #undef HAVE_ATOMIC_ADD
#undef HAVE_ATOMIC_SUB #undef HAVE_ATOMIC_SUB
#endif #endif
...@@ -200,6 +200,7 @@ ...@@ -200,6 +200,7 @@
#endif #endif
#ifdef HAVE_ATOMIC_ADD #ifdef HAVE_ATOMIC_ADD
#define __SMP__ #define __SMP__
#define CONFIG_SMP
#include <asm/atomic.h> #include <asm/atomic.h>
#endif #endif
......
...@@ -90,14 +90,14 @@ extern "C" { // Because of SCO 3.2V4.2 ...@@ -90,14 +90,14 @@ extern "C" { // Because of SCO 3.2V4.2
int allow_severity = LOG_INFO; int allow_severity = LOG_INFO;
int deny_severity = LOG_WARNING; int deny_severity = LOG_WARNING;
#ifdef __linux__ #ifdef __STDC__
#define my_fromhost(A) fromhost()
#define my_hosts_access(A) hosts_access()
#define my_eval_client(A) eval_client()
#else
#define my_fromhost(A) fromhost(A) #define my_fromhost(A) fromhost(A)
#define my_hosts_access(A) hosts_access(A) #define my_hosts_access(A) hosts_access(A)
#define my_eval_client(A) eval_client(A) #define my_eval_client(A) eval_client(A)
#else
#define my_fromhost(A) fromhost()
#define my_hosts_access(A) hosts_access()
#define my_eval_client(A) eval_client()
#endif #endif
#endif /* HAVE_LIBWRAP */ #endif /* HAVE_LIBWRAP */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment