Skip to content

Commit a4b2f2b

Browse files
authored
Merge pull request #6453 from nysal/xlc_asm_warning_fix
opal/asm: Fix a compiler warning on POWER arch
2 parents 4e71f41 + da6d038 commit a4b2f2b

File tree

1 file changed

+2
-22
lines changed

1 file changed

+2
-22
lines changed

opal/include/opal/sys/powerpc/atomic.h

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -98,27 +98,7 @@ void opal_atomic_isync(void)
9898
ISYNC();
9999
}
100100

101-
#elif OPAL_XLC_INLINE_ASSEMBLY /* end OPAL_GCC_INLINE_ASSEMBLY */
102-
103-
/* Yeah, I don't know who thought this was a reasonable syntax for
104-
* inline assembly. Do these because they are used so often and they
105-
* are fairly simple (aka: there is a tech pub on IBM's web site
106-
* containing the right hex for the instructions).
107-
*/
108-
109-
#undef OPAL_HAVE_INLINE_ATOMIC_MEM_BARRIER
110-
#define OPAL_HAVE_INLINE_ATOMIC_MEM_BARRIER 0
111-
112-
#pragma mc_func opal_atomic_mb { "7c0004ac" } /* sync */
113-
#pragma reg_killed_by opal_atomic_mb /* none */
114-
115-
#pragma mc_func opal_atomic_rmb { "7c2004ac" } /* lwsync */
116-
#pragma reg_killed_by opal_atomic_rmb /* none */
117-
118-
#pragma mc_func opal_atomic_wmb { "7c2004ac" } /* lwsync */
119-
#pragma reg_killed_by opal_atomic_wmb /* none */
120-
121-
#endif
101+
#endif /* end OPAL_GCC_INLINE_ASSEMBLY */
122102

123103
/**********************************************************************
124104
*
@@ -296,7 +276,7 @@ static inline bool opal_atomic_compare_exchange_strong_64 (opal_atomic_int64_t *
296276
#define opal_atomic_sc_64(addr, value, ret) \
297277
do { \
298278
opal_atomic_int64_t *_addr = (addr); \
299-
int64_t _foo, _newval = (int64_t) value; \
279+
int64_t _newval = (int64_t) value; \
300280
int32_t _ret; \
301281
\
302282
__asm__ __volatile__ (" stdcx. %2, 0, %1 \n\t" \

0 commit comments

Comments
 (0)