diff options
Diffstat (limited to 'libatomic')
| -rw-r--r-- | libatomic/ChangeLog | 10 | ||||
| -rw-r--r-- | libatomic/Makefile.am | 2 | ||||
| -rw-r--r-- | libatomic/Makefile.in | 8 | ||||
| -rwxr-xr-x | libatomic/configure | 2 | ||||
| -rw-r--r-- | libatomic/configure.ac | 2 | ||||
| -rw-r--r-- | libatomic/fence.c | 45 | ||||
| -rw-r--r-- | libatomic/flag.c | 64 | ||||
| -rw-r--r-- | libatomic/libatomic.map | 9 |
8 files changed, 136 insertions, 6 deletions
diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog index 9ca15c2..fadb79f 100644 --- a/libatomic/ChangeLog +++ b/libatomic/ChangeLog @@ -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 diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am index 3d8ab62..bd0ab29 100644 --- a/libatomic/Makefile.am +++ b/libatomic/Makefile.am @@ -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@ diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in index 9288652..b696d55 100644 --- a/libatomic/Makefile.in +++ b/libatomic/Makefile.in @@ -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@ diff --git a/libatomic/configure b/libatomic/configure index 3623c09..8526abf 100755 --- a/libatomic/configure +++ b/libatomic/configure @@ -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 diff --git a/libatomic/configure.ac b/libatomic/configure.ac index d5e67c8..bdbf825 100644 --- a/libatomic/configure.ac +++ b/libatomic/configure.ac @@ -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 index 0000000..a4152f1 --- /dev/null +++ b/libatomic/fence.c @@ -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 index 0000000..bc8cc14 --- /dev/null +++ b/libatomic/flag.c @@ -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); +} diff --git a/libatomic/libatomic.map b/libatomic/libatomic.map index 8fd2baf..39e7c2c 100644 --- a/libatomic/libatomic.map +++ b/libatomic/libatomic.map @@ -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; |