From 988dd6384c88a110952833dfe7c8344b9af95fa4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely <jwakely@redhat.com> Date: Tue, 12 Dec 2023 14:54:36 +0000 Subject: [PATCH] libstdc++: Remove redundant -std flags from Makefile In r14-4060-gc4baeaecbbf7d0 I moved some files from src/c++98 to src/c++11 but I didn't remove the redundant -std=gnu++11 flags for those files. The flags aren't needed now, because AM_CXXFLAGS for that directory already uses -std=gnu++11. This removes them. libstdc++-v3/ChangeLog: * src/c++11/Makefile.am: Remove redundant -std=gnu++11 flags. * src/c++11/Makefile.in: Regenerate. --- libstdc++-v3/src/c++11/Makefile.am | 8 ++++---- libstdc++-v3/src/c++11/Makefile.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am index 9cddb978928f..b626e477dde7 100644 --- a/libstdc++-v3/src/c++11/Makefile.am +++ b/libstdc++-v3/src/c++11/Makefile.am @@ -159,13 +159,13 @@ limits.lo: limits.cc limits.o: limits.cc $(CXXCOMPILE) -fchar8_t -c $< locale_init.lo: locale_init.cc - $(LTCXXCOMPILE) -std=gnu++11 -fchar8_t -c $< + $(LTCXXCOMPILE) -fchar8_t -c $< locale_init.o: locale_init.cc - $(CXXCOMPILE) -std=gnu++11 -fchar8_t -c $< + $(CXXCOMPILE) -fchar8_t -c $< localename.lo: localename.cc - $(LTCXXCOMPILE) -std=gnu++11 -fchar8_t -c $< + $(LTCXXCOMPILE) -fchar8_t -c $< localename.o: localename.cc - $(CXXCOMPILE) -std=gnu++11 -fchar8_t -c $< + $(CXXCOMPILE) -fchar8_t -c $< if ENABLE_DUAL_ABI # Rewrite the type info for __ios_failure. diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in index e6d37c5464ca..4be021e80259 100644 --- a/libstdc++-v3/src/c++11/Makefile.in +++ b/libstdc++-v3/src/c++11/Makefile.in @@ -887,13 +887,13 @@ limits.lo: limits.cc limits.o: limits.cc $(CXXCOMPILE) -fchar8_t -c $< locale_init.lo: locale_init.cc - $(LTCXXCOMPILE) -std=gnu++11 -fchar8_t -c $< + $(LTCXXCOMPILE) -fchar8_t -c $< locale_init.o: locale_init.cc - $(CXXCOMPILE) -std=gnu++11 -fchar8_t -c $< + $(CXXCOMPILE) -fchar8_t -c $< localename.lo: localename.cc - $(LTCXXCOMPILE) -std=gnu++11 -fchar8_t -c $< + $(LTCXXCOMPILE) -fchar8_t -c $< localename.o: localename.cc - $(CXXCOMPILE) -std=gnu++11 -fchar8_t -c $< + $(CXXCOMPILE) -fchar8_t -c $< @ENABLE_DUAL_ABI_TRUE@cxx11-ios_failure-lt.s: cxx11-ios_failure.cc @ENABLE_DUAL_ABI_TRUE@ $(LTCXXCOMPILE) -gno-as-loc-support -S $< -o tmp-cxx11-ios_failure-lt.s -- GitLab