From 7581b88af9f621fa77e9d2a30889a85855d501c0 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Sat, 13 Dec 2008 07:57:51 +0000 Subject: [PATCH] Makefile.am: Remove -x c++ for atomic build rules. 2008-12-12 Benjamin Kosnik * 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 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/src/Makefile.am | 4 ++-- libstdc++-v3/src/Makefile.in | 4 ++-- libstdc++-v3/src/atomic.cc | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 66dbdfdf059..a2b80b57bec 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2008-12-12 Benjamin Kosnik + + * 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 PR libstdc++/37144 diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 4b086c6dc34..c88b3d18ac7 100644 --- 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 2dc9203cf3b..c3cfecc609e 100644 --- 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 9e6444dcfe3..5c6d58ab3cb 100644 --- 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 #include +#include #define LOGSIZE 4 -- 2.30.2