Changeset e99e43f for libcfa/src/bits/locks.hfa

Timestamp:

Jan 10, 2019, 3:50:34 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

d97c3a4

Parents:

aeb8f70 (diff), 08222c7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Aaron Moss <a3moss@…> (01/10/19 14:46:09)

git-committer:

Aaron Moss <a3moss@…> (01/10/19 15:50:34)

Message:

Merge remote-tracking branch 'plg/master' into deferred_resn

File:

• libcfa/src/bits/locks.hfa (modified) (2 diffs)

libcfa/src/bits/locks.hfa

@@ -37 +37 @@
 #endif
 
-#if defined( __i386 ) || defined( __x86_64 ) || defined( __ARM_ARCH )
-        // Intel recommendation
-        #define __ALIGN__ __attribute__(( aligned (128) ))
-#elif defined( __sparc )
-        #define __ALIGN__ CALIGN
-#else
-        #error unsupported architecture
-#endif
-
 struct __spinlock_t {
         // Wrap in struct to prevent false sharing with debug info
-        struct {
-                // Align lock on 128-bit boundary
-                __ALIGN__ volatile bool lock;
-        };
+        volatile bool lock;
         #ifdef __CFA_DEBUG__
                 // previous function to acquire the lock
@@ -58 +46 @@
                 void* prev_thrd;
         #endif
-} __ALIGN__;
+};
 
 #ifdef __cforall