Makefile.am: Compile del_ops.cc as C++14.

	* libsupc++/Makefile.am: Compile del_ops.cc as C++14.
	* libsupc++/Makefile.in: Regenerate.

From-SVN: r219317

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ebd789c219d88f877f2aab523f427f872eac2d0c..affe20416bbaed99ed31e9f75fee8335294dfa31 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-07  Jonathan Wakely  <jwakely@redhat.com>
+
+       * libsupc++/Makefile.am: Compile del_ops.cc as C++14.
+       * libsupc++/Makefile.in: Regenerate.
+
 2015-01-06  Jonathan Wakely  <jwakely@redhat.com>
 
        * config/abi/pre/gnu.ver: Fix version conflict for std::locale::name().

diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am
index 06e56b65b25cdd8adf3443a0ed78dda9fb184cea..aace1a6fe764f255b7f4d994f32039b6c0ed4445 100644 (file)
--- a/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@ -177,6 +177,12 @@ new_opnt.lo: new_opnt.cc
 new_opnt.o: new_opnt.cc
        $(CXXCOMPILE) -std=gnu++11 -c $<
 
+# Use special rules for the C++14 sources so that the proper flags are passed.
+del_ops.lo: del_ops.cc
+       $(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
+del_ops.o: del_ops.cc
+       $(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
+
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
 # modified in a per-library or per-sub-library way.  Need to manually
 # set this option because CONFIG_CXXFLAGS has to be after

diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index 9a1d725e3605c65c1fd699b5c30672d96948d5b7..50fee54a922b6aa03597bcbb21ac34c1e815f24c 100644 (file)
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -870,6 +870,12 @@ new_opnt.lo: new_opnt.cc
 new_opnt.o: new_opnt.cc
        $(CXXCOMPILE) -std=gnu++11 -c $<
 
+# Use special rules for the C++14 sources so that the proper flags are passed.
+del_ops.lo: del_ops.cc
+       $(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
+del_ops.o: del_ops.cc
+       $(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
+
 install-stdHEADERS: $(std_HEADERS)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(stddir)