diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2016-11-23 20:02:39 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2016-11-23 20:30:57 +0300 |
| commit | 8e4213ff4329d5bcbbb76644084ccf3c76c3ef25 (patch) | |
| tree | bb9ad733c5be556a3e4064cef297e9d133295338 | |
| parent | 58ce63e1ff80cf0464d56c76818bef1b05407113 (diff) | |
| download | libatomic_ops-8e4213ff4329d5bcbbb76644084ccf3c76c3ef25.tar.gz | |
Undefine internal macros that are defined solely for generic.h
(fix commits 03a0465f, 3c52619c, 66f7a4d3)
* src/atomic_ops/sysdeps/gcc/aarch64.h (AO_SKIPATOMIC_double_load,
AO_SKIPATOMIC_double_load_acquire): Undefine at the end of file.
* src/atomic_ops/sysdeps/gcc/arm.h (AO_SKIPATOMIC_ANY_and_ANY,
AO_SKIPATOMIC_ANY_or_ANY, AO_SKIPATOMIC_ANY_xor_ANY,
AO_SKIPATOMIC_char_store, AO_SKIPATOMIC_char_store_release,
AO_SKIPATOMIC_int_store, AO_SKIPATOMIC_int_store_release,
AO_SKIPATOMIC_short_store, AO_SKIPATOMIC_short_store_release,
AO_SKIPATOMIC_store, AO_SKIPATOMIC_store_release): Likewise.
| -rw-r--r-- | src/atomic_ops/sysdeps/gcc/aarch64.h | 3 | ||||
| -rw-r--r-- | src/atomic_ops/sysdeps/gcc/arm.h | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/atomic_ops/sysdeps/gcc/aarch64.h b/src/atomic_ops/sysdeps/gcc/aarch64.h index 11bc6c5..97d6ea6 100644 --- a/src/atomic_ops/sysdeps/gcc/aarch64.h +++ b/src/atomic_ops/sysdeps/gcc/aarch64.h @@ -211,3 +211,6 @@ #endif #include "generic.h" + +#undef AO_SKIPATOMIC_double_load +#undef AO_SKIPATOMIC_double_load_acquire diff --git a/src/atomic_ops/sysdeps/gcc/arm.h b/src/atomic_ops/sysdeps/gcc/arm.h index 633ed3b..28ba9cc 100644 --- a/src/atomic_ops/sysdeps/gcc/arm.h +++ b/src/atomic_ops/sysdeps/gcc/arm.h @@ -723,6 +723,17 @@ AO_fetch_compare_and_swap(volatile AO_t *addr, AO_t old_val, AO_t new_val) #undef AO_BR_ALIGN #undef AO_MASK_PTR +#undef AO_SKIPATOMIC_ANY_and_ANY +#undef AO_SKIPATOMIC_ANY_or_ANY +#undef AO_SKIPATOMIC_ANY_xor_ANY +#undef AO_SKIPATOMIC_char_store +#undef AO_SKIPATOMIC_char_store_release +#undef AO_SKIPATOMIC_int_store +#undef AO_SKIPATOMIC_int_store_release +#undef AO_SKIPATOMIC_short_store +#undef AO_SKIPATOMIC_short_store_release +#undef AO_SKIPATOMIC_store +#undef AO_SKIPATOMIC_store_release #undef AO_THUMB_GO_ARM #undef AO_THUMB_RESTORE_MODE #undef AO_THUMB_SWITCH_CLOBBERS |