From 473da7e22c809fda9e3b37557d6ee8c07b226ca4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 25 Sep 2020 12:50:17 +0100 Subject: [PATCH] libstdc++: Remove redundant -std=gnu++1z flags from makefile Now that G++ defaults to gnu++17 we don't need special rules for compiling the C++17 allocation and deallocation functions. libstdc++-v3/ChangeLog: * libsupc++/Makefile.am: Remove redundant -std=gnu++1z flags. * libsupc++/Makefile.in: Regenerate. --- libstdc++-v3/libsupc++/Makefile.am | 22 ---------------------- libstdc++-v3/libsupc++/Makefile.in | 22 ---------------------- 2 files changed, 44 deletions(-) diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 35ad3ae7799..091fe159d5a 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -128,28 +128,6 @@ cp-demangle.o: cp-demangle.c $(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -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 $< -new_opant.lo: new_opant.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -new_opva.lo: new_opva.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -new_opvant.lo: new_opvant.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opa.lo: del_opa.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opant.lo: del_opant.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opsa.lo: del_opsa.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opva.lo: del_opva.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opvant.lo: del_opvant.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opvsa.lo: del_opvsa.cc - $(LTCXXCOMPILE) -std=gnu++1z -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 5106f8a246e..82056e4693c 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -957,28 +957,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++17 sources so that the proper flags are passed. -new_opa.lo: new_opa.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -new_opant.lo: new_opant.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -new_opva.lo: new_opva.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -new_opvant.lo: new_opvant.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opa.lo: del_opa.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opant.lo: del_opant.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opsa.lo: del_opsa.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opva.lo: del_opva.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opvant.lo: del_opvant.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< -del_opvsa.lo: del_opvsa.cc - $(LTCXXCOMPILE) -std=gnu++1z -c $< - install-stdHEADERS: $(std_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(stddir) -- 2.30.2