Add out-of-line versions of some <stdatomic.h> functions (PR c/65083).

PR c/65083 notes that some functions in <stdatomic.h> are normal
functions, not generic functions, and so need to have out-of-line
copies that can be called when macro expansion is suppressed (unlike
the generic functions where DR#419 makes it undefined if you suppress
a macro expansion).

This patch adds such out-of-line definitions in libatomic for those
six functions, at a new LIBATOMIC_1.2 symbol version, as trivial
wrappers to the <stdatomic.h> macros, along with declarations of those
functions in <stdatomic.h>.  Tests are added that are based on the
corresponding tests for the macros, but with parentheses around the
function names to force the out-of-line functions to be used.

Bootstrapped with no regressions on x86_64-pc-linux-gnu.

gcc:
	* ginclude/stdatomic.h (atomic_thread_fence, atomic_signal_fence)
	(atomic_flag_test_and_set, atomic_flag_test_and_set_explicit)
	(atomic_flag_clear, atomic_flag_clear_explicit): Declare as
	functions before defining as macros.

gcc/testsuite:
	* gcc.dg/atomic/stdatomic-fence-2.c,
	gcc.dg/atomic/stdatomic-flag-2.c: New tests.

libatomic:
	* fence.c, flag.c: New files.
	* Makefile.am (libatomic_la_SOURCES): Add fence.c and flag.c.
	* Makefile.in: Regenerate.
	* configure.ac (libtool_VERSION): Change to 3:0:2.
	* configure: Regenerate.
	* libatomic.map (LIBATOMIC_1.2): New symbol version.

From-SVN: r230578

5 files changed, 87 insertions, 0 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 999a15c..4b788d3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-11-18  Joseph Myers  <joseph@codesourcery.com>
+
+	PR c/65083
+	* ginclude/stdatomic.h (atomic_thread_fence, atomic_signal_fence)
+	(atomic_flag_test_and_set, atomic_flag_test_and_set_explicit)
+	(atomic_flag_clear, atomic_flag_clear_explicit): Declare as
+	functions before defining as macros.
+
 2015-11-18  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* config/nvptx/nvptx.c (nvptx_process_pars): Fix whitespace.
diff --git a/gcc/ginclude/stdatomic.h b/gcc/ginclude/stdatomic.h
index b961da2..eb3b4d6 100644
--- a/gcc/ginclude/stdatomic.h
+++ b/gcc/ginclude/stdatomic.h
@@ -91,7 +91,9 @@ typedef _Atomic __UINTMAX_TYPE__ atomic_uintmax_t;
     __kill_dependency_tmp;			\
   })
 
+extern void atomic_thread_fence (memory_order);
 #define atomic_thread_fence(MO)	__atomic_thread_fence (MO)
+extern void atomic_signal_fence (memory_order);
 #define atomic_signal_fence(MO)	__atomic_signal_fence  (MO)
 #define atomic_is_lock_free(OBJ) __atomic_is_lock_free (sizeof (*(OBJ)), (OBJ))
 
@@ -227,12 +229,17 @@ typedef _Atomic struct
 #define ATOMIC_FLAG_INIT	{ 0 }
 
 
+extern _Bool atomic_flag_test_and_set (volatile atomic_flag *);
 #define atomic_flag_test_and_set(PTR) 					\
 			__atomic_test_and_set ((PTR), __ATOMIC_SEQ_CST)
+extern _Bool atomic_flag_test_and_set_explicit (volatile atomic_flag *,
+						memory_order);
 #define atomic_flag_test_and_set_explicit(PTR, MO)			\
 			__atomic_test_and_set ((PTR), (MO))
 
+extern void atomic_flag_clear (volatile atomic_flag *);
 #define atomic_flag_clear(PTR)	__atomic_clear ((PTR), __ATOMIC_SEQ_CST)
+extern void atomic_flag_clear_explicit (volatile atomic_flag *, memory_order);
 #define atomic_flag_clear_explicit(PTR, MO)   __atomic_clear ((PTR), (MO))
 
 #endif  /* _STDATOMIC_H */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index edd201f..3ac9cb8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-18  Joseph Myers  <joseph@codesourcery.com>
+
+	PR c/65083
+	* gcc.dg/atomic/stdatomic-fence-2.c,
+	gcc.dg/atomic/stdatomic-flag-2.c: New tests.
+
 2015-11-18  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/loop_optimization19.adb: New test.
diff --git a/gcc/testsuite/gcc.dg/atomic/stdatomic-fence-2.c b/gcc/testsuite/gcc.dg/atomic/stdatomic-fence-2.c
new file mode 100644
index 0000000..6916e89
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/atomic/stdatomic-fence-2.c
@@ -0,0 +1,26 @@
+/* Test atomic_*_fence routines for existence and execution with each
+   valid memory model.  Out-of-line function calls.  */
+/* { dg-do run } */
+/* { dg-options "-std=c11 -pedantic-errors" } */
+
+#include <stdatomic.h>
+
+int
+main ()
+{
+  (atomic_thread_fence) (memory_order_relaxed);
+  (atomic_thread_fence) (memory_order_consume);
+  (atomic_thread_fence) (memory_order_acquire);
+  (atomic_thread_fence) (memory_order_release);
+  (atomic_thread_fence) (memory_order_acq_rel);
+  (atomic_thread_fence) (memory_order_seq_cst);
+
+  (atomic_signal_fence) (memory_order_relaxed);
+  (atomic_signal_fence) (memory_order_consume);
+  (atomic_signal_fence) (memory_order_acquire);
+  (atomic_signal_fence) (memory_order_release);
+  (atomic_signal_fence) (memory_order_acq_rel);
+  (atomic_signal_fence) (memory_order_seq_cst);
+
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.dg/atomic/stdatomic-flag-2.c b/gcc/testsuite/gcc.dg/atomic/stdatomic-flag-2.c
new file mode 100644
index 0000000..aeae6b7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/atomic/stdatomic-flag-2.c
@@ -0,0 +1,40 @@
+/* Test atomic_flag routines for existence and execution.  Out-of-line
+   function calls.  */
+/* The test needs a lockless atomic implementation.  */
+/* { dg-do run { xfail hppa*-*-hpux* } } */
+/* { dg-options "-std=c11 -pedantic-errors" } */
+
+#include <stdatomic.h>
+
+extern void abort (void);
+atomic_flag a = ATOMIC_FLAG_INIT;
+
+int
+main ()
+{
+  int b;
+
+  if (!atomic_is_lock_free (&a))
+    abort ();
+
+  if ((atomic_flag_test_and_set) (&a))
+    abort ();
+  (atomic_flag_clear_explicit) (&a, memory_order_relaxed);
+  if ((atomic_flag_test_and_set) (&a))
+    abort ();
+  (atomic_flag_clear) (&a);
+
+  b = (atomic_flag_test_and_set_explicit) (&a, memory_order_seq_cst);
+  if (!(atomic_flag_test_and_set) (&a) || b != 0)
+    abort ();
+
+  b = (atomic_flag_test_and_set_explicit) (&a, memory_order_acq_rel);
+  if (!(atomic_flag_test_and_set) (&a) || b != 1)
+    abort ();
+
+  (atomic_flag_clear_explicit) (&a, memory_order_seq_cst);
+  if ((atomic_flag_test_and_set) (&a))
+    abort ();
+
+  return 0;
+}