Skip to content

Commit 8796f05

Browse files
committed
fix libev error/warning
1 parent 6eb2962 commit 8796f05

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

libev/ev.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,6 @@ struct signalfd_siginfo
792792

793793
#ifndef ECB_MEMORY_FENCE
794794
#if ECB_GCC_VERSION(2,5) || defined __INTEL_COMPILER || (__llvm__ && __GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
795-
#define ECB_MEMORY_FENCE_RELAXED __asm__ __volatile__ ("" : : : "memory")
796795
#if __i386 || __i386__
797796
#define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
798797
#define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : "memory")
@@ -810,6 +809,7 @@ struct signalfd_siginfo
810809
|| defined __ARM_ARCH_5T__ || defined __ARM_ARCH_5TE__ \
811810
|| defined __ARM_ARCH_5TEJ__
812811
/* should not need any, unless running old code on newer cpu - arm doesn't support that */
812+
#define ECB_MEMORY_FENCE do { } while (0)
813813
#elif defined __ARM_ARCH_6__ || defined __ARM_ARCH_6J__ \
814814
|| defined __ARM_ARCH_6K__ || defined __ARM_ARCH_6ZK__ \
815815
|| defined __ARM_ARCH_6T2__
@@ -852,14 +852,12 @@ struct signalfd_siginfo
852852
#define ECB_MEMORY_FENCE __atomic_thread_fence (__ATOMIC_SEQ_CST)
853853
#define ECB_MEMORY_FENCE_ACQUIRE __atomic_thread_fence (__ATOMIC_ACQUIRE)
854854
#define ECB_MEMORY_FENCE_RELEASE __atomic_thread_fence (__ATOMIC_RELEASE)
855-
#define ECB_MEMORY_FENCE_RELAXED __atomic_thread_fence (__ATOMIC_RELAXED)
856855

857856
#elif ECB_CLANG_EXTENSION(c_atomic)
858857
/* see comment below (stdatomic.h) about the C11 memory model. */
859858
#define ECB_MEMORY_FENCE __c11_atomic_thread_fence (__ATOMIC_SEQ_CST)
860859
#define ECB_MEMORY_FENCE_ACQUIRE __c11_atomic_thread_fence (__ATOMIC_ACQUIRE)
861860
#define ECB_MEMORY_FENCE_RELEASE __c11_atomic_thread_fence (__ATOMIC_RELEASE)
862-
#define ECB_MEMORY_FENCE_RELAXED __c11_atomic_thread_fence (__ATOMIC_RELAXED)
863861

864862
#elif ECB_GCC_VERSION(4,4) || defined __INTEL_COMPILER || defined __clang__
865863
#define ECB_MEMORY_FENCE __sync_synchronize ()
@@ -882,7 +880,6 @@ struct signalfd_siginfo
882880
#define ECB_MEMORY_FENCE __machine_rw_barrier ()
883881
#define ECB_MEMORY_FENCE_ACQUIRE __machine_acq_barrier ()
884882
#define ECB_MEMORY_FENCE_RELEASE __machine_rel_barrier ()
885-
#define ECB_MEMORY_FENCE_RELAXED __compiler_barrier ()
886883
#elif __xlC__
887884
#define ECB_MEMORY_FENCE __sync ()
888885
#endif
@@ -925,10 +922,6 @@ struct signalfd_siginfo
925922
#define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
926923
#endif
927924

928-
#if !defined ECB_MEMORY_FENCE_RELAXED && defined ECB_MEMORY_FENCE
929-
#define ECB_MEMORY_FENCE_RELAXED ECB_MEMORY_FENCE /* very heavy-handed */
930-
#endif
931-
932925
/*****************************************************************************/
933926

934927
#if ECB_CPP

0 commit comments

Comments
 (0)