mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added some patches provided by SuSE to fix build problems on

Browse source 
ppc64 and x86-64, fixed a compile bug when building with TCP wrapper
support on Linux


bdb/dist/acconfig.h:
  Added patch for x86_64 (provided by SuSE)
bdb/dist/aclocal/mutex.m4:
  Added patch for x86_64 (provided by SuSE)
bdb/include/mutex.h:
  Added patch for x86_64 (provided by SuSE)
include/global.h:
  Added a SMP-related patch for PPC64 (provided by SuSE)
sql/mysqld.cc:
  Compile fix for Linux when compiling with --with-librwap
This commit is contained in:
unknown 2002-07-15 13:33:56 +02:00
parent 3814a0ff76
commit f9232ee503
5 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bdb/dist/acconfig.h vendored
View file

@ -52,6 +52,7 @@
#undef HAVE_MUTEX_WIN16
#undef HAVE_MUTEX_WIN32
#undef HAVE_MUTEX_X86_GCC_ASSEMBLY
#undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
/* Define if building on QNX. */
#undef HAVE_QNX

12
bdb/dist/aclocal/mutex.m4 vendored
View file

@ -314,6 +314,18 @@ AC_TRY_RUN([main(){
}], [db_cv_mutex="x86/gcc-assembly"])
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
if test "$db_cv_mutex" = no; then
AC_TRY_RUN([main(){

22
bdb/include/mutex.h
View file

@ -611,6 +611,28 @@ typedef unsigned char tsl_t;
#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.
*

3
include/global.h
View file

@ -139,7 +139,7 @@
#endif
/* 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_SUB
#endif
@ -200,6 +200,7 @@
#endif
#ifdef HAVE_ATOMIC_ADD
#define __SMP__
#define CONFIG_SMP
#include <asm/atomic.h>
#endif

10
sql/mysqld.cc
View file

@ -90,14 +90,14 @@ extern "C" { // Because of SCO 3.2V4.2
int allow_severity = LOG_INFO;
int deny_severity = LOG_WARNING;
#ifdef __linux__
#define my_fromhost(A) fromhost()
#define my_hosts_access(A) hosts_access()
#define my_eval_client(A) eval_client()
#else
#ifdef __STDC__
#define my_fromhost(A) fromhost(A)
#define my_hosts_access(A) hosts_access(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 /* HAVE_LIBWRAP */