Remove libsupc++ makefile targets setting -std=gnu++11 or -std=gnu++14

* libsupc++/Makefile.am: Remove custom targets for files that need to
	be compiled as C++11 or C++14.
	* libsupc++/Makefile.in: Regenerate.
	* libsupc++/del_ops.cc: Use pragma to disable -Wsized-deallocation
	warnings.
	* libsupc++/del_opvs.cc: Likewise.

From-SVN: r248823
This commit is contained in:
Jonathan Wakely 2017-06-02 12:49:04 +01:00 committed by Jonathan Wakely
parent c957e9c052
commit ef3985dbd1
5 changed files with 11 additions and 142 deletions

View File

@ -1,3 +1,12 @@
2017-06-02 Jonathan Wakely <jwakely@redhat.com>
* libsupc++/Makefile.am: Remove custom targets for files that need to
be compiled as C++11 or C++14.
* libsupc++/Makefile.in: Regenerate.
* libsupc++/del_ops.cc: Use pragma to disable -Wsized-deallocation
warnings.
* libsupc++/del_opvs.cc: Likewise.
2017-06-02 Richard Biener <rguenther@suse.de>
Markus Eisenmann <meisenmann.lba@fh-salzburg.ac.at>

View File

@ -128,77 +128,6 @@ cp-demangle.o: cp-demangle.c
$(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
# Use special rules for the C++11 sources so that the proper flags are passed.
bad_array_length.lo: bad_array_length.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
bad_array_length.o: bad_array_length.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
bad_array_new.lo: bad_array_new.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
bad_array_new.o: bad_array_new.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
eh_aux_runtime.lo: eh_aux_runtime.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
eh_aux_runtime.o: eh_aux_runtime.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
eh_ptr.lo: eh_ptr.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
eh_ptr.o: eh_ptr.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
eh_terminate.lo: eh_terminate.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
eh_terminate.o: eh_terminate.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
eh_throw.lo: eh_throw.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
eh_throw.o: eh_throw.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
guard.lo: guard.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
guard.o: guard.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
atexit_thread.lo: atexit_thread.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
atexit_thread.o: atexit_thread.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
nested_exception.lo: nested_exception.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
nested_exception.o: nested_exception.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
new_handler.lo: new_handler.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
new_handler.o: new_handler.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
new_op.lo: new_op.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
new_op.o: new_op.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
new_opnt.lo: new_opnt.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
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 $<
del_opvs.lo: del_opvs.cc
$(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
del_opvs.o: del_opvs.cc
$(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
# Use special rules for the C++17 sources so that the proper flags are passed.
new_opa.lo: new_opa.cc
$(LTCXXCOMPILE) -std=gnu++1z -c $<

View File

@ -860,77 +860,6 @@ cp-demangle.lo: cp-demangle.c
cp-demangle.o: cp-demangle.c
$(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
# Use special rules for the C++11 sources so that the proper flags are passed.
bad_array_length.lo: bad_array_length.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
bad_array_length.o: bad_array_length.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
bad_array_new.lo: bad_array_new.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
bad_array_new.o: bad_array_new.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
eh_aux_runtime.lo: eh_aux_runtime.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
eh_aux_runtime.o: eh_aux_runtime.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
eh_ptr.lo: eh_ptr.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
eh_ptr.o: eh_ptr.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
eh_terminate.lo: eh_terminate.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
eh_terminate.o: eh_terminate.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
eh_throw.lo: eh_throw.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
eh_throw.o: eh_throw.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
guard.lo: guard.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
guard.o: guard.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
atexit_thread.lo: atexit_thread.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
atexit_thread.o: atexit_thread.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
nested_exception.lo: nested_exception.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
nested_exception.o: nested_exception.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
new_handler.lo: new_handler.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
new_handler.o: new_handler.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
new_op.lo: new_op.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
new_op.o: new_op.cc
$(CXXCOMPILE) -std=gnu++11 -c $<
new_opnt.lo: new_opnt.cc
$(LTCXXCOMPILE) -std=gnu++11 -c $<
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 $<
del_opvs.lo: del_opvs.cc
$(LTCXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
del_opvs.o: del_opvs.cc
$(CXXCOMPILE) -std=gnu++14 -Wno-sized-deallocation -c $<
# Use special rules for the C++17 sources so that the proper flags are passed.
new_opa.lo: new_opa.cc
$(LTCXXCOMPILE) -std=gnu++1z -c $<

View File

@ -23,6 +23,7 @@
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
// <http://www.gnu.org/licenses/>.
#pragma GCC diagnostic ignored "-Wsized-deallocation"
#include <bits/c++config.h>
#include "new"

View File

@ -23,6 +23,7 @@
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
// <http://www.gnu.org/licenses/>.
#pragma GCC diagnostic ignored "-Wsized-deallocation"
#include <bits/c++config.h>
#include "new"