Makefile.am: Remove -x c++ for atomic build rules.

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.

From-SVN: r142738

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 66dbdfdf0597eb826a1761ea4bf3fad63a2595e5..a2b80b57bec0294c9f5243117c0cab7c9a864815 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

diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 4b086c6dc3407c31160d28f6d23e32ac1e2b3d27..c88b3d18ac7252f06f1cb1b56925bb20971871f4 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
-       $(LTCXXCOMPILE) -x c++ -std=gnu++0x -c $<
+       $(LTCXXCOMPILE) -std=gnu++0x -c $<
 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 $<

diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 2dc9203cf3bdb8eba248b05b3488ef1a80dcf25e..c3cfecc609e19fa00519e69a542d6e63f7ac2242 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
-       $(LTCXXCOMPILE) -x c++ -std=gnu++0x -c $<
+       $(LTCXXCOMPILE) -std=gnu++0x -c $<
 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 $<

diff --git a/libstdc++-v3/src/atomic.cc b/libstdc++-v3/src/atomic.cc
index 9e6444dcfe374cd03b572489f7264cc203ff0751..5c6d58ab3cb78dde4fbf866dd2b308ba3103e194 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"
-#include <cstdatomic>
 #include <mutex>
+#include <cstdatomic>
 
 #define LOGSIZE 4