commit: ff1de10818c52725954f2f02e718c05c231512e4 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Dec 1 22:49:19 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Dec 1 22:49:34 2024 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=ff1de108
15.0.0: rebase 28_all_drop_CFLAGS_sed.patch Signed-off-by: Sam James <sam <AT> gentoo.org> 15.0.0/gentoo/28_all_drop_CFLAGS_sed.patch | 12 ++++++------ 15.0.0/gentoo/README.history | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/15.0.0/gentoo/28_all_drop_CFLAGS_sed.patch b/15.0.0/gentoo/28_all_drop_CFLAGS_sed.patch index 764f34c..fb514cb 100644 --- a/15.0.0/gentoo/28_all_drop_CFLAGS_sed.patch +++ b/15.0.0/gentoo/28_all_drop_CFLAGS_sed.patch @@ -3,7 +3,7 @@ https://github.com/InBetweenNames/gentooLTO/issues/846 https://github.com/vaeth/portage-bashrc-mv/issues/11 --- a/gcc/configure +++ b/gcc/configure -@@ -5388,13 +5388,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex +@@ -5473,13 +5473,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -11,15 +11,15 @@ https://github.com/vaeth/portage-bashrc-mv/issues/11 -# optimizations to be activated explicitly by the toplevel. -case "$CC" in - */prev-gcc/xgcc*) ;; -- *) CFLAGS=`echo "$CFLAGS " | sed -e "s/-Ofast[ ]//" -e "s/-O[gs][ ]//" -e "s/-O[0-9]*[ ]//" ` -- CXXFLAGS=`echo "$CXXFLAGS " | sed -e "s/-Ofast[ ]//" -e "s/-O[gs][ ]//" -e "s/-O[0-9]*[ ]//" ` ;; +- *) CFLAGS=`echo "$CFLAGS " | sed -e "s/-Ofast[ ]//" -e "s/-O[gs][ ]//" -e "s/[^,]-O[0-9]*[ ]//" ` +- CXXFLAGS=`echo "$CXXFLAGS " | sed -e "s/-Ofast[ ]//" -e "s/-O[gs][ ]//" -e "s/[^,]-O[0-9]*[ ]//" ` ;; -esac --- a/gcc/configure.ac +++ b/gcc/configure.ac -@@ -440,13 +440,6 @@ ACX_PROG_GDC([-I"$srcdir"/d]) +@@ -463,13 +463,6 @@ ACX_PROG_GDC([-I"$srcdir"/d]) # Do configure tests with the C++ compiler, since that's what we build with. AC_LANG(C++) @@ -27,8 +27,8 @@ https://github.com/vaeth/portage-bashrc-mv/issues/11 -# optimizations to be activated explicitly by the toplevel. -case "$CC" in - */prev-gcc/xgcc*) ;; -- *) CFLAGS=`echo "$CFLAGS " | sed -e "s/-Ofast[[ ]]//" -e "s/-O[[gs]][[ ]]//" -e "s/-O[[0-9]]*[[ ]]//" ` -- CXXFLAGS=`echo "$CXXFLAGS " | sed -e "s/-Ofast[[ ]]//" -e "s/-O[[gs]][[ ]]//" -e "s/-O[[0-9]]*[[ ]]//" ` ;; +- *) CFLAGS=`echo "$CFLAGS " | sed -e "s/-Ofast[[ ]]//" -e "s/-O[[gs]][[ ]]//" -e "s/[[^,]]-O[[0-9]]*[[ ]]//" ` +- CXXFLAGS=`echo "$CXXFLAGS " | sed -e "s/-Ofast[[ ]]//" -e "s/-O[[gs]][[ ]]//" -e "s/[[^,]]-O[[0-9]]*[[ ]]//" ` ;; -esac AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) diff --git a/15.0.0/gentoo/README.history b/15.0.0/gentoo/README.history index fc9e803..2b369b3 100644 --- a/15.0.0/gentoo/README.history +++ b/15.0.0/gentoo/README.history @@ -3,6 +3,7 @@ - 72_all_PR111600-genemit-Distribute-evenly-to-files.patch U 04_all_nossp-on-nostdlib.patch U 26_all_enable-cet.patch + U 28_all_drop_CFLAGS_sed.patch 28 25 November 2024
