Skip to content

Commit 79fc9d5

Browse files
committed
Revert "* Some recent versions of GCC try very hard to make it impossible to"
This reverts commit b5ea5e0 This commit reverts a change that is hopefully not necessary. If this is the case this will fix #4146. Signed-off-by: Nathan Hjelm <[email protected]>
1 parent 89c860b commit 79fc9d5

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

opal/include/opal/sys/ia32/atomic.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2007-2010 Oracle and/or its affiliates. All rights reserved.
1414
* Copyright (c) 2015 Research Organization for Information Science
1515
* and Technology (RIST). All rights reserved.
16-
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
16+
* Copyright (c) 2015-2017 Los Alamos National Security, LLC. All rights
1717
* reserved.
1818
* $COPYRIGHT$
1919
*
@@ -111,12 +111,6 @@ static inline int opal_atomic_cmpset_32(volatile int32_t *addr,
111111

112112
#if OPAL_GCC_INLINE_ASSEMBLY
113113

114-
#if 0
115-
116-
/* some versions of GCC won't let you use ebx period (even though they
117-
should be able to save / restore for the life of the inline
118-
assembly). For the beta, just use the non-inline version */
119-
120114
#ifndef ll_low /* GLIBC provides these somewhere, so protect */
121115
#define ll_low(x) *(((unsigned int*)&(x))+0)
122116
#define ll_high(x) *(((unsigned int*)&(x))+1)
@@ -150,7 +144,6 @@ static inline int opal_atomic_cmpset_64(volatile int64_t *addr,
150144
: "cc", "memory", "ebx");
151145
return (int) ret;
152146
}
153-
#endif /* if 0 */
154147

155148
#endif /* OPAL_GCC_INLINE_ASSEMBLY */
156149

0 commit comments

Comments
 (0)