Add out-of-line versions of some <stdatomic.h> functions (PR c/65083).
authorJoseph Myers <joseph@codesourcery.com>
Wed, 18 Nov 2015 22:13:44 +0000 (22:13 +0000)
committerJoseph Myers <jsm28@gcc.gnu.org>
Wed, 18 Nov 2015 22:13:44 +0000 (22:13 +0000)
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

13 files changed:
gcc/ChangeLog
gcc/ginclude/stdatomic.h
gcc/testsuite/ChangeLog
gcc/testsuite/gcc.dg/atomic/stdatomic-fence-2.c [new file with mode: 0644]
gcc/testsuite/gcc.dg/atomic/stdatomic-flag-2.c [new file with mode: 0644]
libatomic/ChangeLog
libatomic/Makefile.am
libatomic/Makefile.in
libatomic/configure
libatomic/configure.ac
libatomic/fence.c [new file with mode: 0644]
libatomic/flag.c [new file with mode: 0644]
libatomic/libatomic.map

index 999a15c35142971fa1c9c640c894176c93612cf1..4b788d331e221aa7c44cbc7b62e46b935d60acef 100644 (file)
@@ -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.
index b961da2172115a82d50057b4e712ed914038d0d4..eb3b4d6f115ca820398a67a5a8a55b8b87182d9a 100644 (file)
@@ -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 */
index edd201f209bf4df9b2399a8d94e81dfc012b7f68..3ac9cb864739b23696058c8892b699972d1aef51 100644 (file)
@@ -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 (file)
index 0000000..6916e89
--- /dev/null
@@ -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 (file)
index 0000000..aeae6b7
--- /dev/null
@@ -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;
+}
index 9ca15c2cc653b903ab70bef3978ffbb59f644ef9..fadb79f1af4035074aa2027ffd322a145feccc82 100644 (file)
@@ -1,3 +1,13 @@
+2015-11-18  Joseph Myers  <joseph@codesourcery.com>
+
+       PR c/65083
+       * 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.
+
 2015-10-09  David Malcolm  <dmalcolm@redhat.com>
 
        * testsuite/lib/libatomic.exp: Load multiline.exp before
index 3d8ab62dc8f4f766114481e2925a2cbc2cbbd0bb..bd0ab293131f090a6bc00f2714f0d6c0f5d5c201 100644 (file)
@@ -68,7 +68,7 @@ libatomic_version_info = -version-info $(libtool_VERSION)
 
 libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags)
 libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c \
-       fenv.c
+       fenv.c fence.c flag.c
 
 SIZEOBJS = load store cas exch fadd fsub fand fior fxor fnand tas
 SIZES = @SIZES@
index 9288652d9f203715ec318133b4f88f6e6ee56559..b696d554777744276891d76bd820156f0f36f1cd 100644 (file)
@@ -114,14 +114,14 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES)
 am_libatomic_la_OBJECTS = gload.lo gstore.lo gcas.lo gexch.lo \
-       glfree.lo lock.lo init.lo fenv.lo
+       glfree.lo lock.lo init.lo fenv.lo fence.lo flag.lo
 libatomic_la_OBJECTS = $(am_libatomic_la_OBJECTS)
 libatomic_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(libatomic_la_LDFLAGS) $(LDFLAGS) -o $@
 libatomic_convenience_la_DEPENDENCIES = $(libatomic_la_LIBADD)
 am__objects_1 = gload.lo gstore.lo gcas.lo gexch.lo glfree.lo lock.lo \
-       init.lo fenv.lo
+       init.lo fenv.lo fence.lo flag.lo
 am_libatomic_convenience_la_OBJECTS = $(am__objects_1)
 libatomic_convenience_la_OBJECTS =  \
        $(am_libatomic_convenience_la_OBJECTS)
@@ -317,7 +317,7 @@ noinst_LTLIBRARIES = libatomic_convenience.la
 libatomic_version_info = -version-info $(libtool_VERSION)
 libatomic_la_LDFLAGS = $(libatomic_version_info) $(libatomic_version_script) $(lt_host_flags)
 libatomic_la_SOURCES = gload.c gstore.c gcas.c gexch.c glfree.c lock.c init.c \
-       fenv.c
+       fenv.c fence.c flag.c
 
 SIZEOBJS = load store cas exch fadd fsub fand fior fxor fnand tas
 EXTRA_libatomic_la_SOURCES = $(addsuffix _n.c,$(SIZEOBJS))
@@ -456,7 +456,9 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fence.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fenv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flag.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gcas.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gexch.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glfree.Plo@am__quote@
index 3623c09c13a894a0fd4081835b0014f5c72203fc..8526abff90f2ba1d379eda40bcc62fa85421da6d 100755 (executable)
@@ -11503,7 +11503,7 @@ fi
 
 
 # For libtool versioning info, format is CURRENT:REVISION:AGE
-libtool_VERSION=2:0:1
+libtool_VERSION=3:0:2
 
 
 # Check for used threading-model
index d5e67c851d2f16373849220fc8936f8d186e127e..bdbf825e0cbc490cfb0df984ed7597b7215c2886 100644 (file)
@@ -149,7 +149,7 @@ AC_SUBST(enable_static)
 AM_MAINTAINER_MODE
 
 # For libtool versioning info, format is CURRENT:REVISION:AGE
-libtool_VERSION=2:0:1
+libtool_VERSION=3:0:2
 AC_SUBST(libtool_VERSION)
 
 # Check for used threading-model
diff --git a/libatomic/fence.c b/libatomic/fence.c
new file mode 100644 (file)
index 0000000..a4152f1
--- /dev/null
@@ -0,0 +1,45 @@
+/* Copyright (C) 2015 Free Software Foundation, Inc.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+   FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+   more details.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include "libatomic_i.h"
+
+#include <stdatomic.h>
+
+/* Out-of-line versions of <stdatomic.h> fence functions.  */
+
+/* Fence as specified by ORDER.  */
+
+void
+(atomic_thread_fence) (memory_order order)
+{
+  atomic_thread_fence (order);
+}
+
+/* Fence as specified by ORDER but only establishing ordering between
+   a thread and a signal handler executed in that thread.  */
+
+void
+(atomic_signal_fence) (memory_order order)
+{
+  atomic_signal_fence (order);
+}
diff --git a/libatomic/flag.c b/libatomic/flag.c
new file mode 100644 (file)
index 0000000..bc8cc14
--- /dev/null
@@ -0,0 +1,64 @@
+/* Copyright (C) 2015 Free Software Foundation, Inc.
+
+   This file is part of the GNU Atomic Library (libatomic).
+
+   Libatomic is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   Libatomic is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+   FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+   more details.
+
+   Under Section 7 of GPL version 3, you are granted additional
+   permissions described in the GCC Runtime Library Exception, version
+   3.1, as published by the Free Software Foundation.
+
+   You should have received a copy of the GNU General Public License and
+   a copy of the GCC Runtime Library Exception along with this program;
+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include "libatomic_i.h"
+
+#include <stdatomic.h>
+
+/* Out-of-line versions of <stdatomic.h> flag functions.  */
+
+/* Atomically set *OBJECT to true, returning the previous value.  */
+
+_Bool
+(atomic_flag_test_and_set) (volatile atomic_flag *object)
+{
+  return atomic_flag_test_and_set (object);
+}
+
+/* Atomically set *OBJECT to true, returning the previous value, with
+   memory affected according to ORDER.  */
+
+_Bool
+(atomic_flag_test_and_set_explicit) (volatile atomic_flag *object,
+                                    memory_order order)
+{
+  return atomic_flag_test_and_set_explicit (object, order);
+}
+
+/* Atomically set *OBJECT to false.  */
+
+void
+(atomic_flag_clear) (volatile atomic_flag *object)
+{
+  atomic_flag_clear (object);
+}
+
+/* Atomically set *OBJECT to false, with memory affected according to
+   ORDER.  */
+
+void
+(atomic_flag_clear_explicit) (volatile atomic_flag *object,
+                             memory_order order)
+{
+  return atomic_flag_clear_explicit (object, order);
+}
index 8fd2bafd80c49ffcf9aa27b90812d54c5c4e0e0a..39e7c2c6b9a70121b5f4031da346a27ae6c1be98 100644 (file)
@@ -99,3 +99,12 @@ LIBATOMIC_1.1 {
   global:
        __atomic_feraiseexcept;
 } LIBATOMIC_1.0;
+LIBATOMIC_1.2 {
+  global:
+       atomic_thread_fence;
+       atomic_signal_fence;
+       atomic_flag_test_and_set;
+       atomic_flag_test_and_set_explicit;
+       atomic_flag_clear;
+       atomic_flag_clear_explicit;
+} LIBATOMIC_1.1;