Check in patch/merge from cxx-mem-model Branch

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / src / Makefile.in

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index c52e5c4..4b2646e 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -105,9 +105,9 @@ am__objects_1 = atomicity.lo codecvt_members.lo collate_members.lo \
 @ENABLE_PARALLEL_TRUE@ compatibility-parallel_list-2.lo
 am__objects_5 = basic_file.lo c++locale.lo $(am__objects_2) \
        $(am__objects_3) $(am__objects_4)
-am__objects_6 = atomic.lo bitmap_allocator.lo pool_allocator.lo \
-       mt_allocator.lo codecvt.lo compatibility.lo \
-       compatibility-c++0x.lo compatibility-debug_list.lo \
+am__objects_6 = bitmap_allocator.lo pool_allocator.lo mt_allocator.lo \
+       codecvt.lo compatibility.lo compatibility-c++0x.lo \
+       compatibility-atomic-c++0x.lo compatibility-debug_list.lo \
        compatibility-debug_list-2.lo compatibility-list.lo \
        compatibility-list-2.lo complex_io.lo ctype.lo debug.lo \
        functexcept.lo functional.lo globals_io.lo hash_c++0x.lo \
@@ -407,13 +407,13 @@ host_sources_extra = \
 
 # Sources present in the src directory, always present.
 sources = \
-       atomic.cc \
        bitmap_allocator.cc \
        pool_allocator.cc \
        mt_allocator.cc \
        codecvt.cc \
        compatibility.cc \
        compatibility-c++0x.cc \
+       compatibility-atomic-c++0x.cc \
        compatibility-debug_list.cc \
        compatibility-debug_list-2.cc \
        compatibility-list.cc \
@@ -917,6 +917,11 @@ compatibility-c++0x.lo: compatibility-c++0x.cc
 compatibility-c++0x.o: compatibility-c++0x.cc
        $(CXXCOMPILE) -std=gnu++0x -c $<
 
+compatibility-atomic-c++0x.lo: compatibility-atomic-c++0x.cc
+       $(LTCXXCOMPILE) -std=gnu++0x -c $<
+compatibility-atomic-c++0x.o: compatibility-atomic-c++0x.cc
+       $(CXXCOMPILE) -std=gnu++0x -c $<
+
 functional.lo: functional.cc
        $(LTCXXCOMPILE) -std=gnu++0x -c $<
 functional.o: functional.cc
@@ -937,11 +942,6 @@ limits.lo: limits.cc
 limits.o: limits.cc
        $(CXXCOMPILE) -std=gnu++0x -c $<
 
-atomic.lo: atomic.cc
-       $(LTCXXCOMPILE) -std=gnu++0x -c $<
-atomic.o: atomic.cc
-       $(CXXCOMPILE) -std=gnu++0x -c $<
-
 fstream-inst.lo: fstream-inst.cc
        $(LTCXXCOMPILE) -std=gnu++0x -c $<
 fstream-inst.o: fstream-inst.cc