diff mbox

Fix warning during libstdc++ build

Message ID 20150107224927.GD3360@redhat.com
State New
Headers show

Commit Message

Jonathan Wakely Jan. 7, 2015, 10:49 p.m. UTC 
This fixes a -Wc++14-compat warning in the new libsupc++/del_ops.cc
file that defines the C++14 sized deallocation function.

Tested x86_64-linux, committed to trunk.
diff mbox

Patch

commit 9236910f087450f43ce80d696737e9ecd96bb1ef
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Jan 6 17:30:21 2015 +0000

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

diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am
index 06e56b6..aace1a6 100644
--- 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 9a1d725..50fee54 100644
--- 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)