always define HAVE_memory_barrier

gcc/ChangeLog:

2015-05-23  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* defaults.h (gen_memory_barrier): New function.
	(HAVE_memory_barrier): Add default value.
	* optabs.c: Adjust.

From-SVN: r223621

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2f40e8dc70a3b83dec9aef2d31453d64934f7dd6..cd0358a976ed3770e9b31c0f277d9ed7efa4bae9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-23  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+       * defaults.h (gen_memory_barrier): New function.
+       (HAVE_memory_barrier): Add default value.
+       * optabs.c: Adjust.
+
 2015-05-23  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
        * defaults.h (gen_mem_thread_fence): New function.

diff --git a/gcc/defaults.h b/gcc/defaults.h
index 72b290aaf652f8cf5ada570e8264fabf8eef4403..a7455e59ec9bbe9067f4532a89c5cdccb039d096 100644 (file)
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -1454,6 +1454,16 @@ gen_mem_thread_fence (rtx)
 }
 #endif
 
+#ifndef HAVE_memory_barrier
+#define HAVE_memory_barrier 0
+static inline rtx
+gen_memory_barrier ()
+{
+  gcc_unreachable ();
+  return NULL;
+}
+#endif
+
 #endif /* GCC_INSN_FLAGS_H  */
 
 #endif  /* ! GCC_DEFAULTS_H */

diff --git a/gcc/optabs.c b/gcc/optabs.c
index 197e4aef5f41ce895d41a0e32402d52ff33b36a1..d3c1d21d4454af491eb465a9097503c771f26d37 100644 (file)
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -7589,11 +7589,6 @@ expand_asm_memory_barrier (void)
 /* This routine will either emit the mem_thread_fence pattern or issue a 
    sync_synchronize to generate a fence for memory model MEMMODEL.  */
 
-#ifndef HAVE_memory_barrier
-# define HAVE_memory_barrier 0
-# define gen_memory_barrier()  (gcc_unreachable (), NULL_RTX)
-#endif
-
 void
 expand_mem_thread_fence (enum memmodel model)
 {