bk commit into 6.0 tree (hakank:1.2666)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakank.  When hakank does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-03 16:12:30+02:00, hakank@lu0011.(none) +1 -0
  gcc can use the assembler version of atomic_cas*.

  storage/falcon/Interlock.h@stripped, 2008-05-03 16:12:28+02:00, hakank@lu0011.(none) +2 -2
    gcc can use the assembler version of atomic_cas*.

diff -Nrup a/storage/falcon/Interlock.h b/storage/falcon/Interlock.h
--- a/storage/falcon/Interlock.h	2008-04-29 17:50:09 +02:00
+++ b/storage/falcon/Interlock.h	2008-05-03 16:12:28 +02:00
@@ -142,7 +142,7 @@ inline int inline_cas (volatile int *tar
        We are running Sun Studio on SPARC or x86
        Todo: get assembler version of atomic_cas_uint().
      */
-#elif defined(__sparcv8) || defined(__sparcv9) || defined(__sun)
+#elif (defined(__sparcv8) || defined(__sparcv9) || defined(__sun)) &&
!defined(__GNUC__)
 #if defined(__SunOS_5_10)
     return (compare == atomic_cas_uint((volatile uint_t *)target, compare, exchange));
 #else
@@ -252,7 +252,7 @@ inline char inline_cas_pointer (volatile
        We are running Sun Studio on SPARC or x86
        Todo: get assembler version of atomic_cas_ptr().
      */
-#elif defined(__sparcv8) || defined(__sparcv9) || defined(__sun)
+#elif (defined(__sparcv8) || defined(__sparcv9) || defined(__sun)) &&
!defined(__GNUC__)
 #if defined(__SunOS_5_10)
     return (char)(compare == atomic_cas_ptr(target, compare, exchange));
 #else