diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2013-07-21 19:21:03 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2013-07-21 20:21:03 +0100 |
| commit | 3429db0fb07ae6f0fb09f72667f5dc0e818df349 (patch) | |
| tree | faa1ebb885d503c2570ad7b5b434d21adfd16316 /libstdc++-v3/src/Makefile.in | |
| parent | d4aef883b7470379c369588dbea57315e1c67a4c (diff) | |
| download | gcc-3429db0fb07ae6f0fb09f72667f5dc0e818df349.tar.gz | |
re PR libstdc++/54352 (relaxed data race rules for ~condition_variable_any)
PR libstdc++/54352
* include/std/condition_variable (condition_variable_any): Move into
inline namespace _V2 and replace mutex member with shared_ptr<mutex>.
* src/c++11/condition_variable.cc (condition_variable_any): Move
definitions to ...
* src/c++11/compatibility-condvar.cc (condition_variable_any): Here.
* src/Makefile.am: Add new source file.
* src/Makefile.in: Regenerate.
From-SVN: r201112
Diffstat (limited to 'libstdc++-v3/src/Makefile.in')
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index a7b3404d0a6..93215e0fddd 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -93,7 +93,8 @@ am__DEPENDENCIES_1 = am__objects_2 = compatibility.lo compatibility-debug_list.lo \ compatibility-debug_list-2.lo $(am__objects_1) am__objects_3 = compatibility-c++0x.lo compatibility-atomic-c++0x.lo \ - compatibility-thread-c++0x.lo compatibility-chrono.lo + compatibility-thread-c++0x.lo compatibility-chrono.lo \ + compatibility-condvar.lo am_libstdc___la_OBJECTS = $(am__objects_2) $(am__objects_3) libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -352,7 +353,8 @@ cxx11_sources = \ compatibility-c++0x.cc \ compatibility-atomic-c++0x.cc \ compatibility-thread-c++0x.cc \ - compatibility-chrono.cc + compatibility-chrono.cc \ + compatibility-condvar.cc libstdc___la_SOURCES = $(cxx98_sources) $(cxx11_sources) libstdc___la_LIBADD = \ @@ -854,6 +856,11 @@ compatibility-chrono.lo: compatibility-chrono.cc compatibility-chrono.o: compatibility-chrono.cc $(CXXCOMPILE) -std=gnu++11 -c $< +compatibility-condvar.lo: compatibility-condvar.cc + $(LTCXXCOMPILE) -std=gnu++11 -c $< +compatibility-condvar.o: compatibility-condvar.cc + $(CXXCOMPILE) -std=gnu++11 -c $< + # Symbol versioning for shared libraries. @ENABLE_SYMVERS_TRUE@libstdc++-symbols.ver: ${glibcxx_srcdir}/$(SYMVER_FILE) \ @ENABLE_SYMVERS_TRUE@ $(port_specific_symbol_files) |