diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2008-12-13 07:57:51 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2008-12-13 07:57:51 +0000 |
| commit | 7581b88af9f621fa77e9d2a30889a85855d501c0 (patch) | |
| tree | fda1a54811e20b953e67999c69f6597faf2011eb | |
| parent | 81ff169c9e6466828f8246ccab828ef5a83cb0cb (diff) | |
| download | gcc-7581b88af9f621fa77e9d2a30889a85855d501c0.zip gcc-7581b88af9f621fa77e9d2a30889a85855d501c0.tar.gz gcc-7581b88af9f621fa77e9d2a30889a85855d501c0.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/atomic.cc | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 66dbdfd..a2b80b5 100644 --- 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 4b086c6..c88b3d1 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 2dc9203..c3cfecc 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 9e6444d..5c6d58a 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 <cstdatomic> #include <mutex> +#include <cstdatomic> #define LOGSIZE 4 |