compiler-rt-git: Try to fix build of atomic.c

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Jun 6 23:57:54 2017 +0200
Changeset:	ff5edb3093983b4feb7a2272a9569751d0f6f361

Modified Files:
	compiler-rt-git/distinfo
	compiler-rt-git/patches/patch-lib_builtins_atomic.c

Log Message:
compiler-rt-git: Try to fix build of atomic.c

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ff5edb3093983b4feb7a2272a9569751d0f6f361

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compiler-rt-git/distinfo                           |  2 +-
 .../patches/patch-lib_builtins_atomic.c            | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs:
diff --git a/compiler-rt-git/distinfo b/compiler-rt-git/distinfo
index 9d782719a1..38d8cc9beb 100644
--- a/compiler-rt-git/distinfo
+++ b/compiler-rt-git/distinfo
@@ -12,5 +12,5 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
 SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
 RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
-SHA1 (patch-lib_builtins_atomic.c) = c57d5fa959f8a5c9fd8b44b5e141182f15414777
+SHA1 (patch-lib_builtins_atomic.c) = e0b7c62ff11b86318e2fdbabb6360f19661fa38a
 SHA1 (patch-lib_builtins_gcc__personality__v0.c) = 0a48656e68614730ea05e8fb2588434e774b3c45
diff --git a/compiler-rt-git/patches/patch-lib_builtins_atomic.c b/compiler-rt-git/patches/patch-lib_builtins_atomic.c
index 5dc7bb6d68..ba36bbff7d 100644
--- a/compiler-rt-git/patches/patch-lib_builtins_atomic.c
+++ b/compiler-rt-git/patches/patch-lib_builtins_atomic.c
@@ -35,32 +35,32 @@ $NetBSD$
 +  __c11_atomic_fetch_xor(object, operand, order)
 +#elif defined(__GNUC__)
 +#define atomic_store_explicit(object, desired, order)                          \
-+  __atomic_store_n(&(object)->__val, desired, order)
++  __atomic_store_n(object, desired, order)
 +#define atomic_compare_exchange_weak_explicit(object, expected, desired,       \
 +                                              success, failure)                \
-+  __atomic_compare_exchange_n(&(object)->__val, expected, desired, 1, success, \
++  __atomic_compare_exchange_n(object, expected, desired, 1, success, \
 +                              failure)
-+#define atomic_is_lock_free(object) __atomic_is_lock_free(object)
++#define atomic_is_lock_free(object) __atomic_is_lock_free(object, NULL)
 +#define atomic_load_explicit(object, order)                                    \
-+  __atomic_load_n(&(object)->__val, order)
++  __atomic_load_n(object, order)
 +#define atomic_compare_exchange_strong_explicit(object, expected, desired,     \
 +                                                success, failure)              \
-+  __atomic_compare_exchange_n(&(object)->__val, expected, desired, 0, success, \
++  __atomic_compare_exchange_n(object, expected, desired, 0, success, \
 +                              failure)
 +#define atomic_exchange_explicit(object, desired, order)                       \
-+  __atomic_exchange_n(&(object)->__val, desired, order)
++  __atomic_exchange_n(object, desired, order)
 +#define atomic_thread_fence(object)                       \
 +  __atomic_thread_fence(object)
 +#define atomic_fetch_add_explicit(object, operand, order)                      \
-+  __atomic_fetch_add(&(object)->__val, operand, order)
++  __atomic_fetch_add(object, operand, order)
 +#define atomic_fetch_and_explicit(object, operand, order)                      \
-+  __atomic_fetch_and(&(object)->__val, operand, order)
++  __atomic_fetch_and(object, operand, order)
 +#define atomic_fetch_or_explicit(object, operand, order)                       \
-+  __atomic_fetch_or(&(object)->__val, operand, order)
++  __atomic_fetch_or(object, operand, order)
 +#define atomic_fetch_sub_explicit(object, operand, order)                      \
-+  __atomic_fetch_sub(&(object)->__val, operand, order)
++  __atomic_fetch_sub(object, operand, order)
 +#define atomic_fetch_xor_explicit(object, operand, order)                      \
-+  __atomic_fetch_xor(&(object)->__val, operand, order)
++  __atomic_fetch_xor(object, operand, order)
 +#else
 +#error "atomic.c does not support your compiler"
 +#endif