2008-12-12 Benjamin Kosnik <bkoz@redhat.com>

	* src/Makefile.am: Remove -x c++ for atomic build rules.
	* src/Makefile.in: Regenerate.
	* src/atomic.cc: Move mutex include before cstdatomic.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142738 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 66dbdfd..a2b80b5 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-12  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * src/Makefile.am: Remove -x c++ for atomic build rules.
+       * src/Makefile.in: Regenerate.
+       * src/atomic.cc: Move mutex include before cstdatomic.
+

 2008-12-12  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR libstdc++/37144
 2008-12-12  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR libstdc++/37144

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 4b086c6..c88b3d1 100644 (file)
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -274,9 +274,9 @@ limits_c++0x.o: limits_c++0x.cc
        $(CXXCOMPILE) -std=gnu++0x -c $<
 
 atomic.lo: atomic.cc
        $(CXXCOMPILE) -std=gnu++0x -c $<
 
 atomic.lo: atomic.cc

-       $(LTCXXCOMPILE) -x c++ -std=gnu++0x -c $<
+       $(LTCXXCOMPILE) -std=gnu++0x -c $<

 atomic.o: atomic.cc
 atomic.o: atomic.cc

-       $(CXXCOMPILE) -x c++ -std=gnu++0x -c $<
+       $(CXXCOMPILE) -std=gnu++0x -c $<

 
 string-inst.lo: string-inst.cc
        $(LTCXXCOMPILE) -std=gnu++0x -c $<
 
 string-inst.lo: string-inst.cc
        $(LTCXXCOMPILE) -std=gnu++0x -c $<

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 2dc9203..c3cfecc 100644 (file)
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -883,9 +883,9 @@ limits_c++0x.o: limits_c++0x.cc
        $(CXXCOMPILE) -std=gnu++0x -c $<
 
 atomic.lo: atomic.cc
        $(CXXCOMPILE) -std=gnu++0x -c $<
 
 atomic.lo: atomic.cc

-       $(LTCXXCOMPILE) -x c++ -std=gnu++0x -c $<
+       $(LTCXXCOMPILE) -std=gnu++0x -c $<

 atomic.o: atomic.cc
 atomic.o: atomic.cc

-       $(CXXCOMPILE) -x c++ -std=gnu++0x -c $<
+       $(CXXCOMPILE) -std=gnu++0x -c $<

 
 string-inst.lo: string-inst.cc
        $(LTCXXCOMPILE) -std=gnu++0x -c $<
 
 string-inst.lo: string-inst.cc
        $(LTCXXCOMPILE) -std=gnu++0x -c $<

diff --git a/libstdc++-v3/src/atomic.cc b/libstdc++-v3/src/atomic.cc
index 9e6444d..5c6d58a 100644 (file)
--- a/libstdc++-v3/src/atomic.cc
+++ b/libstdc++-v3/src/atomic.cc
@@ -29,8 +29,8 @@
 // the GNU General Public License.
 
 #include "gstdint.h"
 // the GNU General Public License.
 
 #include "gstdint.h"

-#include <cstdatomic>

 #include <mutex>
 #include <mutex>

+#include <cstdatomic>

 
 #define LOGSIZE 4
 
 
 #define LOGSIZE 4