*** old/src/share/vm/runtime/atomic.hpp	Thu Sep 11 23:19:49 2014
--- new/src/share/vm/runtime/atomic.hpp	Thu Sep 11 23:19:49 2014

*** 103,113 ****
--- 103,118 ----
  
    // Performs atomic compare of *dest and compare_value, and exchanges
    // *dest with exchange_value if the comparison succeeded. Returns prior
    // value of *dest. cmpxchg*() provide:
    // <fence> compare-and-exchange <membar StoreLoad|StoreStore>
           static jbyte    cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value);
+ #ifdef X86
+   inline static
+ #else
+          static 
+ #endif // X86
+                 jbyte    cmpxchg    (jbyte    exchange_value, volatile jbyte*    dest, jbyte    compare_value);
    inline static jint     cmpxchg    (jint     exchange_value, volatile jint*     dest, jint     compare_value);
    // See comment above about using jlong atomics on 32-bit platforms
    inline static jlong    cmpxchg    (jlong    exchange_value, volatile jlong*    dest, jlong    compare_value);
  
           static unsigned int cmpxchg(unsigned int exchange_value,