1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for BUG#45131

Browse Source
This commit is contained in:
Mikael Ronstrom 2009-06-10 12:23:02 +02:00
parent 7f2db925de
commit 510835a072
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/atomic/x86-gcc.h
View File

@ -35,7 +35,7 @@
asm volatile (LOCK "; xadd %0, %1;" : "+r" (v) , "+m" (*a))
#endif
#define make_atomic_swap_body(S) \
asm volatile ("; xchg %0, %1;" : "+r" (v) , "+m" (*a))
asm volatile ("; xchg %0, %1;" : "+q" (v) , "+m" (*a))
#define make_atomic_cas_body(S) \
asm volatile (LOCK "; cmpxchg %3, %0; setz %2;" \
: "+m" (*a), "+a" (*cmp), "=q" (ret): "r" (set))

14
storage/innobase/include/univ.i
View File

@ -67,20 +67,6 @@ of the 32-bit x86 assembler in mutex operations. */
# define UNIV_MUST_NOT_INLINE
# endif
/* When on Solaris, gcc, and 32-bit disable inlining */
# if defined(__GNUC__) && defined(UNIV_SOLARIS) && defined(__i386__)
# undef UNIV_MUST_NOT_INLINE
# define UNIV_MUST_NOT_INLINE
# endif
/* When on Mac OS X, gcc, and 32-bit x86 disable inlining */
# if defined(__GNUC__) && defined(__APPLE__) && defined (__MACH__) && defined(__i386__)
# undef UNIV_MUST_NOT_INLINE
# define UNIV_MUST_NOT_INLINE
# endif
# ifdef HAVE_PREAD
# define HAVE_PWRITE
# endif