* [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/
@ 2022-11-02 17:07 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-11-02 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 01fd5d7f44dee4836111388a119aad4b5b3b232c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 2 17:06:56 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 2 17:07:27 2022 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=01fd5d7f
13: drop upstreamed 12_all_disable-systemtap-switch.patch
Bug: https://bugs.gentoo.org/879049
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gentoo/12_all_disable-systemtap-switch.patch | 122 ---------------------
1 file changed, 122 deletions(-)
diff --git a/13.1.0/gentoo/12_all_disable-systemtap-switch.patch b/13.1.0/gentoo/12_all_disable-systemtap-switch.patch
deleted file mode 100644
index 4d69141..0000000
--- a/13.1.0/gentoo/12_all_disable-systemtap-switch.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From bb510ed7ea82093c924b027489db6f92250a85b3 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 12 May 2018 12:56:46 +0100
-Subject: [PATCH] gcc/configure.ac: add --disable-systemtap switch
-
-Before the change systemtap probes were enabled
-if target headers had sys/sdt.h at ./configure time.
-
-After the change explicitly ask to enable or disable
-for probe support and not rely on automagic dependency
-discovery.
-
-Bug: https://bugs.gentoo.org/654748
-Bug: https://gcc.gnu.org/bugzilla/PR61257
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- gcc/configure | 34 ++++++++++++++++++++++++++--------
- gcc/configure.ac | 30 ++++++++++++++++++++++--------
- 2 files changed, 48 insertions(+), 16 deletions(-)
-
-diff --git a/gcc/configure b/gcc/configure
-index 3dcf7752b..c2049f117 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -1015,6 +1015,7 @@ enable_gnu_unique_object
- enable_linker_build_id
- enable_libssp
- enable_default_ssp
-+enable_systemtap
- with_long_double_128
- with_long_double_format
- with_gc
-@@ -1773,6 +1774,7 @@ Optional Features:
- compiler will always pass --build-id to linker
- --enable-libssp enable linking against libssp
- --enable-default-ssp enable Stack Smashing Protection as default
-+ --disable-systemtap enable systemtap static probe points [default=auto]
- --enable-maintainer-mode
- enable make rules and dependencies not useful (and
- sometimes confusing) to the casual installer
-@@ -31387,17 +31389,33 @@ fi
-
- # Test for <sys/sdt.h> on the target.
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
-+
-+# Check whether --enable-systemtap was given.
-+if test "${enable_systemtap+set}" = set; then :
-+ enableval=$enable_systemtap; enable_systemtap=$enableval
-+else
-+ enable_systemtap=auto
-+fi
-+
-+
-+if test x$enable_systemtap != xno; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
- $as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
--have_sys_sdt_h=no
--if test -f $target_header_dir/sys/sdt.h; then
-- have_sys_sdt_h=yes
-+ have_sys_sdt_h=no
-+ if test -f $target_header_dir/sys/sdt.h ; then
-+ have_sys_sdt_h=yes
-
- $as_echo "#define HAVE_SYS_SDT_H 1" >>confdefs.h
-
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
-+ fi
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_sys_sdt_h" >&5
- $as_echo "$have_sys_sdt_h" >&6; }
-+ if test x$enable_systemtap = xyes ; then
-+ if test x$have_sys_sdt_h = xno ; then
-+ as_fn_error $? "sys/sdt.h was not found" "$LINENO" 5
-+ fi
-+ fi
-+fi
-
- # Check if TFmode long double should be used by default or not.
- # Some glibc targets used DFmode long double, but with glibc 2.4
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -6904,14 +6904,28 @@ AC_SUBST([enable_default_ssp])
-
- # Test for <sys/sdt.h> on the target.
- GCC_TARGET_TEMPLATE([HAVE_SYS_SDT_H])
--AC_MSG_CHECKING(sys/sdt.h in the target C library)
--have_sys_sdt_h=no
--if test -f $target_header_dir/sys/sdt.h; then
-- have_sys_sdt_h=yes
-- AC_DEFINE(HAVE_SYS_SDT_H, 1,
-- [Define if your target C library provides sys/sdt.h])
--fi
--AC_MSG_RESULT($have_sys_sdt_h)
-+
-+AC_ARG_ENABLE(systemtap,
-+[AS_HELP_STRING([--disable-systemtap],
-+ [enable systemtap static probe points [default=auto]])],
-+ enable_systemtap=$enableval,
-+ enable_systemtap=auto)
-+
-+if test x$enable_systemtap != xno; then
-+ AC_MSG_CHECKING(sys/sdt.h in the target C library)
-+ have_sys_sdt_h=no
-+ if test -f $target_header_dir/sys/sdt.h ; then
-+ have_sys_sdt_h=yes
-+ AC_DEFINE(HAVE_SYS_SDT_H, 1,
-+ [Define if your target C library provides sys/sdt.h])
-+ fi
-+ AC_MSG_RESULT($have_sys_sdt_h)
-+ if test x$enable_systemtap = xyes ; then
-+ if test x$have_sys_sdt_h = xno ; then
-+ AC_MSG_ERROR([sys/sdt.h was not found])
-+ fi
-+ fi
-+fi
-
- # Check if TFmode long double should be used by default or not.
- # Some glibc targets used DFmode long double, but with glibc 2.4
---
-2.17.0
-
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/
@ 2022-11-28 22:38 Andreas K. Hüttel
0 siblings, 0 replies; 11+ messages in thread
From: Andreas K. Hüttel @ 2022-11-28 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 688be5587b9259bbd1bd64be6da4ebdb14f31299
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 22:36:06 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 22:36:06 2022 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=688be558
13.1.0: Move -z now and -fstack-clash-protection out of EXTRA_OPTIONS
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
..._EXTRA_OPTIONS-z-now.patch => 23_all_DEF_GENTOO_ZNOW-z-now.patch} | 4 ++--
...ion.patch => 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch} | 4 ++--
13.1.0/gentoo/README.history | 5 +++++
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch b/13.1.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch
similarity index 91%
rename from 13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch
rename to 13.1.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch
index 8874b32..2ed7968 100644
--- a/13.1.0/gentoo/23_all_EXTRA_OPTIONS-z-now.patch
+++ b/13.1.0/gentoo/23_all_DEF_GENTOO_ZNOW-z-now.patch
@@ -1,4 +1,4 @@
-On Hardened we add some options like -z now
+If requested we add -z now
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -6,7 +6,7 @@ On Hardened we add some options like -z now
#endif
#endif
-+#ifdef EXTRA_OPTIONS
++#ifdef DEF_GENTOO_ZNOW
+#define LINK_NOW_SPEC "%{!nonow:-z now} "
+#else
+#define LINK_NOW_SPEC ""
diff --git a/13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch b/13.1.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
similarity index 96%
rename from 13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
rename to 13.1.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
index e1b3c54..1ed716b 100644
--- a/13.1.0/gentoo/24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+++ b/13.1.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
@@ -1,4 +1,4 @@
-On Hardened we add some options like -fstack-clash-protection.
+We add -fstack-clash-protection if requested
--- a/gcc/common.opt
+++ a/gcc/common.opt
@@ -19,7 +19,7 @@ On Hardened we add some options like -fstack-clash-protection.
+/* Default value for flag_clash_protector when flag_clash_protector is
+ initialized to -1. */
-+#ifdef EXTRA_OPTIONS
++#ifdef DEF_GENTOO_SCP
+#define DEFAULT_FLAG_SCP 1
+#endif
+#ifndef DEFAULT_FLAG_SCP
diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index 6c79f5f..3d797d2 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -1,3 +1,8 @@
+ - 23_all_EXTRA_OPTIONS-z-now.patch
+ + 23_all_DEF_GENTOO_ZNOW-z-now.patch
+ - 24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+ + 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
+
2 8 November 2022
- 12_all_disable-systemtap-switch.patch
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/
@ 2022-11-29 13:21 David Seifert
0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2022-11-29 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 495348e424123f0de3c5d6ce98a9b674cf9cc673
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 12:26:40 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 12:26:40 2022 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=495348e4
13.1.0: update patches + add 2 more, cut patchset 3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
13.1.0/gentoo/26_all_enable-cet.patch | 32 +++++++++----------
13.1.0/gentoo/28_all_drop_CFLAGS_sed.patch | 35 +++++++++++++++++++++
13.1.0/gentoo/29_all_msgfmt-libstdc++-link.patch | 39 ++++++++++++++++++++++++
13.1.0/gentoo/README.history | 4 +++
4 files changed, 94 insertions(+), 16 deletions(-)
diff --git a/13.1.0/gentoo/26_all_enable-cet.patch b/13.1.0/gentoo/26_all_enable-cet.patch
index ecdc64f..a6976c4 100644
--- a/13.1.0/gentoo/26_all_enable-cet.patch
+++ b/13.1.0/gentoo/26_all_enable-cet.patch
@@ -11,7 +11,7 @@ Needs:
Only supported on amd64.
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
-@@ -51,7 +51,7 @@ along with GCC; see the file COPYING3. If not see
+@@ -51,7 +51,7 @@
" %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}"
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
" %{fmodules-ts:-fmodule-header %{fpreprocessed:-fdirectives-only}}"
@@ -20,7 +20,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{!S:-o %g.s%V}"
" %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-@@ -72,7 +72,7 @@ along with GCC; see the file COPYING3. If not see
+@@ -72,7 +72,7 @@
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
" %{fmodules-ts:-fmodule-header=system"
" %{fpreprocessed:-fdirectives-only}}"
@@ -29,7 +29,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{!S:-o %g.s%V}"
" %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-@@ -92,7 +92,7 @@ along with GCC; see the file COPYING3. If not see
+@@ -92,7 +92,7 @@
" %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}"
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
" %{fmodules-ts:-fmodule-header=user %{fpreprocessed:-fdirectives-only}}"
@@ -38,7 +38,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{!S:-o %g.s%V}"
" %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-@@ -107,7 +107,7 @@ along with GCC; see the file COPYING3. If not see
+@@ -107,7 +107,7 @@
" cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed"
" %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}"
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
@@ -47,7 +47,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{fmodule-only:%{!S:-o %g.s%V}}"
" %{!fmodule-only:%(invoke_as)}}"
-@@ -116,7 +116,7 @@ along with GCC; see the file COPYING3. If not see
+@@ -116,7 +116,7 @@
{".ii", "@c++-cpp-output", 0, 0, 0},
{"@c++-cpp-output",
"%{!E:%{!M:%{!MM:"
@@ -58,8 +58,8 @@ Only supported on amd64.
" %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}"
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
-@@ -995,6 +995,18 @@ proper position among the other output files. */
- #endif
+@@ -987,6 +987,18 @@
+ #define LINK_NOW_SPEC ""
#endif
+/* Default value for flag_cf_protection when flag_cf_protection is
@@ -77,7 +77,7 @@ Only supported on amd64.
#ifdef ENABLE_DEFAULT_PIE
#define PIE_SPEC "!no-pie"
#define NO_FPIE1_SPEC "fno-pie"
-@@ -1197,6 +1209,7 @@ static const char *cpp_spec = CPP_SPEC;
+@@ -1189,6 +1201,7 @@
static const char *cc1_spec = CC1_SPEC;
static const char *cc1plus_spec = CC1PLUS_SPEC;
static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
@@ -85,7 +85,7 @@ Only supported on amd64.
static const char *link_ssp_spec = LINK_SSP_SPEC;
static const char *asm_spec = ASM_SPEC;
static const char *asm_final_spec = ASM_FINAL_SPEC;
-@@ -1255,7 +1268,7 @@ static const char *cpp_options =
+@@ -1247,7 +1260,7 @@
"%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
%{f*} %{g*:%{%:debug-level-gt(0):%{g*}\
%{!fno-working-directory:-fworking-directory}}} %{O*}\
@@ -94,7 +94,7 @@ Only supported on amd64.
/* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al.
-@@ -1444,9 +1457,9 @@ static const struct compiler default_compilers[] =
+@@ -1440,9 +1453,9 @@
%{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
%(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
@@ -106,7 +106,7 @@ Only supported on amd64.
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1},
{"-",
"%{!E:%e-E or -x required when input is from standard input}\
-@@ -1471,7 +1484,7 @@ static const struct compiler default_compilers[] =
+@@ -1467,7 +1480,7 @@
%W{o*:--output-pch %*}}%V}}}}}}}", 0, 0, 0},
{".i", "@cpp-output", 0, 0, 0},
{"@cpp-output",
@@ -115,7 +115,7 @@ Only supported on amd64.
{".s", "@assembler", 0, 0, 0},
{"@assembler",
"%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
-@@ -1703,6 +1716,7 @@ static struct spec_list static_specs[] =
+@@ -1699,6 +1712,7 @@
INIT_STATIC_SPEC ("cc1_options", &cc1_options),
INIT_STATIC_SPEC ("cc1plus", &cc1plus_spec),
INIT_STATIC_SPEC ("link_gcc_c_sequence", &link_gcc_c_sequence_spec),
@@ -125,7 +125,7 @@ Only supported on amd64.
INIT_STATIC_SPEC ("link", &link_spec),
--- a/gcc/objc/lang-specs.h
+++ b/gcc/objc/lang-specs.h
-@@ -29,9 +29,9 @@ along with GCC; see the file COPYING3. If not see
+@@ -29,9 +29,9 @@
%{traditional|traditional-cpp:\
%eGNU Objective C no longer supports traditional compilation}\
%{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
@@ -137,7 +137,7 @@ Only supported on amd64.
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
{"@objective-c-header",
"%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp}\
-@@ -40,18 +40,18 @@ along with GCC; see the file COPYING3. If not see
+@@ -40,18 +40,18 @@
%{traditional|traditional-cpp:\
%eGNU Objective C no longer supports traditional compilation}\
%{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
@@ -162,7 +162,7 @@ Only supported on amd64.
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
--- a/gcc/objcp/lang-specs.h
+++ b/gcc/objcp/lang-specs.h
-@@ -36,7 +36,7 @@ along with GCC; see the file COPYING3. If not see
+@@ -36,7 +36,7 @@
%(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\
cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\
%{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
@@ -171,7 +171,7 @@ Only supported on amd64.
-o %g.s %{!o*:--output-pch %i.gch} %W{o*:--output-pch %*}%V}}}",
CPLUSPLUS_CPP_SPEC, 0, 0},
{"@objective-c++",
-@@ -46,16 +46,16 @@ along with GCC; see the file COPYING3. If not see
+@@ -46,16 +46,16 @@
%(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\
cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\
%{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
diff --git a/13.1.0/gentoo/28_all_drop_CFLAGS_sed.patch b/13.1.0/gentoo/28_all_drop_CFLAGS_sed.patch
new file mode 100644
index 0000000..764f34c
--- /dev/null
+++ b/13.1.0/gentoo/28_all_drop_CFLAGS_sed.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/849722
+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
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+-# Remove the -O2: for historical reasons, unless bootstrapping we prefer
+-# 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]*[ ]//" ` ;;
+-esac
+
+
+
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -440,13 +440,6 @@ ACX_PROG_GDC([-I"$srcdir"/d])
+ # Do configure tests with the C++ compiler, since that's what we build with.
+ AC_LANG(C++)
+
+-# Remove the -O2: for historical reasons, unless bootstrapping we prefer
+-# 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]]*[[ ]]//" ` ;;
+-esac
+ AC_SUBST(CFLAGS)
+ AC_SUBST(CXXFLAGS)
+ AC_SUBST(GDCFLAGS)
diff --git a/13.1.0/gentoo/29_all_msgfmt-libstdc++-link.patch b/13.1.0/gentoo/29_all_msgfmt-libstdc++-link.patch
new file mode 100644
index 0000000..0d2f113
--- /dev/null
+++ b/13.1.0/gentoo/29_all_msgfmt-libstdc++-link.patch
@@ -0,0 +1,39 @@
+Ensure that msgfmt doesn't encounter problems during gcc bootstrapping.
+
+Solves error messages like the following:
+
+msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6)
+
+The libgcc_s.so used during build doesn't satisfy the needs of the
+libstdc++.so that msgfmt is linked against. On the other hand, msgfmt
+is used as a stand-alone application here, and what library it uses
+behind the scenes is of no concern to the gcc build process.
+Therefore, simply invoking it "as usual", i.e. without any special
+library path, will make it work as expected here.
+
+2011-09-19 Martin von Gagern
+
+References:
+https://bugs.gentoo.org/372377
+https://bugs.gentoo.org/295480
+https://bugs.gentoo.org/843119
+--- a/libstdc++-v3/po/Makefile.am
++++ b/libstdc++-v3/po/Makefile.am
+@@ -39,6 +39,7 @@ MSGFMT = msgfmt
+ EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN)
+
+ .po.mo:
++ env --unset=LD_LIBRARY_PATH \
+ $(MSGFMT) -o $@ $<
+
+ all-local: all-local-$(USE_NLS)
+--- a/libstdc++-v3/po/Makefile.in
++++ b/libstdc++-v3/po/Makefile.in
+@@ -419,6 +419,7 @@ uninstall-am: uninstall-info-am
+
+
+ .po.mo:
++ env --unset=LD_LIBRARY_PATH \
+ $(MSGFMT) -o $@ $<
+
+ all-local: all-local-$(USE_NLS)
diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index 3d797d2..fcd7f8b 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -1,7 +1,11 @@
+3 29 November 2022
+
- 23_all_EXTRA_OPTIONS-z-now.patch
+ 23_all_DEF_GENTOO_ZNOW-z-now.patch
- 24_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+ 24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch
+ + 28_all_drop_CFLAGS_sed.patch
+ + 29_all_msgfmt-libstdc++-link.patch
2 8 November 2022
- 12_all_disable-systemtap-switch.patch
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/
@ 2022-12-17 4:54 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-12-17 4:54 UTC (permalink / raw
To: gentoo-commits
commit: 80a7f6e8b46af67631ea07059bfa3d460f4c493e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 03:11:33 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 04:54:05 2022 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=80a7f6e8
13.1.0: add 30_all_tar_libstdc++-link.patch
Bug: https://bugs.gentoo.org/886447
Signed-off-by: Sam James <sam <AT> gentoo.org>
13.1.0/gentoo/30_all_tar_libstdc++-link.patch | 54 +++++++++++++++++++++++++++
13.1.0/gentoo/README.history | 3 ++
2 files changed, 57 insertions(+)
diff --git a/13.1.0/gentoo/30_all_tar_libstdc++-link.patch b/13.1.0/gentoo/30_all_tar_libstdc++-link.patch
new file mode 100644
index 0000000..3dd94f8
--- /dev/null
+++ b/13.1.0/gentoo/30_all_tar_libstdc++-link.patch
@@ -0,0 +1,54 @@
+From eae11e896edef4199a128bf6720b5bd4e5edc2f9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 17 Dec 2022 02:42:59 +0000
+Subject: [PATCH] Fix calling libarchive's tar
+
+https://bugs.gentoo.org/886447
+
+Very similar to 33_all_msgfmt-libstdc++-link.patch, whose description is:
+"""
+Ensure that msgfmt doesn't encounter problems during gcc bootstrapping.
+
+Solves error messages like the following:
+
+msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6)
+
+The libgcc_s.so used during build doesn't satisfy the needs of the
+libstdc++.so that msgfmt is linked against. On the other hand, msgfmt
+is used as a stand-alone application here, and what library it uses
+behind the scenes is of no concern to the gcc build process.
+Therefore, simply invoking it "as usual", i.e. without any special
+library path, will make it work as expected here.
+
+2011-09-19 Martin von Gagern
+
+References:
+https://bugs.gentoo.org/372377
+https://bugs.gentoo.org/295480
+https://bugs.gentoo.org/843119
+"""
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -3957,9 +3957,9 @@ install-headers-tar: stmp-int-hdrs install-include-dir
+ # Unless a full pathname is provided, some shells would print the new CWD,
+ # found in CDPATH, corrupting the output. We could just redirect the
+ # output of `cd', but some shells lose on redirection within `()'s
+- (cd `${PWD_COMMAND}`/include ; \
++ (unset LD_LIBRARY_PATH ; cd `${PWD_COMMAND}`/include ; \
+ tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - )
+- (cd `${PWD_COMMAND}`/include-fixed ; \
++ (unset LD_LIBRARY_PATH ; cd `${PWD_COMMAND}`/include-fixed ; \
+ tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; tar xpf - )
+ # /bin/sh on some systems returns the status of the first tar,
+ # and that can lose with GNU tar which always writes a full block.
+@@ -3981,7 +3981,7 @@ install-headers-cp: stmp-int-hdrs install-include-dir
+ # Targets without dependencies, for use in prev-gcc during bootstrap.
+ real-install-headers-tar:
+ (cd `${PWD_COMMAND}`/include-fixed ; \
+- tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; tar xpf - )
++ unset LD_LIBRARY_PATH; tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include-fixed; unset LD_LIBRARY_PATH; tar xpf - )
+
+ real-install-headers-cpio:
+ cd `${PWD_COMMAND}`/include-fixed ; \
diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index fcd7f8b..b56b51e 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -1,3 +1,6 @@
+4 17 Dec 2022
+ + 30_all_tar_libstdc++-link.patch
+
3 29 November 2022
- 23_all_EXTRA_OPTIONS-z-now.patch
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/
@ 2023-01-30 4:21 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-01-30 4:21 UTC (permalink / raw
To: gentoo-commits
commit: 34cb2fd271320c1ba9699d146e98c7fdfac541bb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 01:17:33 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 01:17:33 2023 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=34cb2fd2
13.1.0: update for default hardening as in 12.x
See: 224f6241ec785ccc386eb191df36d919e9b62351
Signed-off-by: Sam James <sam <AT> gentoo.org>
13.1.0/gentoo/01_all_default-fortify-source.patch | 8 ++++++--
13.1.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch | 14 ++++++++++++++
13.1.0/gentoo/README.history | 4 ++++
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/13.1.0/gentoo/01_all_default-fortify-source.patch b/13.1.0/gentoo/01_all_default-fortify-source.patch
index d9f001a..79d6639 100644
--- a/13.1.0/gentoo/01_all_default-fortify-source.patch
+++ b/13.1.0/gentoo/01_all_default-fortify-source.patch
@@ -7,14 +7,18 @@ initially Gentoo used too complicated macro.
# DP: if the optimization level is > 0
--- a/gcc/c-family/c-cppbuiltin.cc
+++ b/gcc/c-family/c-cppbuiltin.cc
-@@ -1510,6 +1510,12 @@ c_cpp_builtins (cpp_reader *pfile)
+@@ -1510,6 +1510,16 @@ c_cpp_builtins (cpp_reader *pfile)
builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
+#if !defined(ACCEL_COMPILER)
++ #ifndef GENTOO_FORTIFY_SOURCE_LEVEL
++ #define GENTOO_FORTIFY_SOURCE_LEVEL 2
++ #endif
++
+ /* Fortify Source enabled by default for optimization levels > 0 */
+ if (optimize)
-+ builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
++ builtin_define_with_int_value ("_FORTIFY_SOURCE", GENTOO_FORTIFY_SOURCE_LEVEL);
+#endif
+
/* Misc. */
diff --git a/13.1.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch b/13.1.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch
new file mode 100644
index 0000000..2daf73b
--- /dev/null
+++ b/13.1.0/gentoo/15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/876895
+--- a/gcc/c-family/c-cppbuiltin.cc
++++ b/gcc/c-family/c-cppbuiltin.cc
+@@ -957,6 +957,10 @@ c_cpp_builtins (cpp_reader *pfile)
+ cpp_define (pfile, "__cpp_rtti=199711L");
+ }
+
++ #ifdef DEF_GENTOO_GLIBCXX_ASSERTIONS
++ cpp_define (pfile, "_GLIBCXX_ASSERTIONS");
++ #endif
++
+ if (cxx_dialect >= cxx11)
+ cpp_define (pfile, "__GXX_EXPERIMENTAL_CXX0X__");
+
diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index 43b714e..1564ee1 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -1,3 +1,7 @@
+6 30 Jan 2023
+ U 01_all_default-fortify-source.patch
+ + 15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch
+
5 17 Dec 2022
U 30_all_tar_libstdc++-link.patch
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/
@ 2023-02-06 17:40 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-02-06 17:40 UTC (permalink / raw
To: gentoo-commits
commit: 3f8fa89d582a0d56ab4eac414552aed99cec6751
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 6 17:32:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 17:32:01 2023 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=3f8fa89d
13.1.0: add 75_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch
Bug: https://bugs.gentoo.org/893410
Signed-off-by: Sam James <sam <AT> gentoo.org>
...07461_cxx_equivalence_non_dependent_calls.patch | 174 +++++++++++++++++++++
13.1.0/gentoo/README.history | 3 +
2 files changed, 177 insertions(+)
diff --git a/13.1.0/gentoo/75_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch b/13.1.0/gentoo/75_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch
new file mode 100644
index 0000000..0a421a1
--- /dev/null
+++ b/13.1.0/gentoo/75_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch
@@ -0,0 +1,174 @@
+https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=31924665c86d47af6b1f22a74f594f2e1dc0ed2d
+(followup to https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=59e0376f607805ef9b67fd7b0a4a3084ab3571a5)
+https://bugs.gentoo.org/893410
+
+From 31924665c86d47af6b1f22a74f594f2e1dc0ed2d Mon Sep 17 00:00:00 2001
+From: Patrick Palka <ppalka@redhat.com>
+Date: Sun, 5 Feb 2023 21:35:33 -0500
+Subject: [PATCH] c++: equivalence of non-dependent calls [PR107461]
+
+After r13-5684-g59e0376f607805 the (pruned) callee of a non-dependent
+CALL_EXPR is a bare FUNCTION_DECL rather than ADDR_EXPR of FUNCTION_DECL.
+This innocent change revealed that cp_tree_equal doesn't first check
+dependence of a CALL_EXPR before treating a FUNCTION_DECL callee as a
+dependent name, which leads to us incorrectly accepting the first two
+testcases below and rejecting the third:
+
+ * In the first testcase, cp_tree_equal incorrectly returns true for
+ the two non-dependent CALL_EXPRs f(0) and f(0) (whose CALL_EXPR_FN
+ are different FUNCTION_DECLs) which causes us to treat #2 as a
+ redeclaration of #1.
+
+ * Same issue in the second testcase, for f<int*>() and f<char>().
+
+ * In the third testcase, cp_tree_equal incorrectly returns true for
+ f<int>() and f<void(*)(int)>() which causes us to conflate the two
+ dependent specializations A<decltype(f<int>()(U()))> and
+ A<decltype(f<void(*)(int)>()(U()))>.
+
+This patch fixes this by making called_fns_equal treat two callees as
+dependent names only if the overall CALL_EXPRs are dependent, via a new
+convenience function call_expr_dependent_name that is like dependent_name
+but also checks dependence of the overall CALL_EXPR.
+
+ PR c++/107461
+
+gcc/cp/ChangeLog:
+
+ * cp-tree.h (call_expr_dependent_name): Declare.
+ * pt.cc (iterative_hash_template_arg) <case CALL_EXPR>: Use
+ call_expr_dependent_name instead of dependent_name.
+ * tree.cc (call_expr_dependent_name): Define.
+ (called_fns_equal): Adjust to take two CALL_EXPRs instead of
+ CALL_EXPR_FNs thereof. Use call_expr_dependent_name instead
+ of dependent_name.
+ (cp_tree_equal) <case CALL_EXPR>: Adjust call to called_fns_equal.
+
+gcc/testsuite/ChangeLog:
+
+ * g++.dg/cpp0x/overload5.C: New test.
+ * g++.dg/cpp0x/overload5a.C: New test.
+ * g++.dg/cpp0x/overload6.C: New test.
+--- a/gcc/cp/cp-tree.h
++++ b/gcc/cp/cp-tree.h
+@@ -7902,6 +7902,7 @@ extern tree lookup_maybe_add (tree fns, tree lookup,
+ extern int is_overloaded_fn (tree) ATTRIBUTE_PURE;
+ extern bool really_overloaded_fn (tree) ATTRIBUTE_PURE;
+ extern tree dependent_name (tree);
++extern tree call_expr_dependent_name (tree);
+ extern tree maybe_get_fns (tree) ATTRIBUTE_PURE;
+ extern tree get_fns (tree) ATTRIBUTE_PURE;
+ extern tree get_first_fn (tree) ATTRIBUTE_PURE;
+--- a/gcc/cp/pt.cc
++++ b/gcc/cp/pt.cc
+@@ -1841,7 +1841,7 @@ iterative_hash_template_arg (tree arg, hashval_t val)
+ case CALL_EXPR:
+ {
+ tree fn = CALL_EXPR_FN (arg);
+- if (tree name = dependent_name (fn))
++ if (tree name = call_expr_dependent_name (arg))
+ {
+ if (TREE_CODE (fn) == TEMPLATE_ID_EXPR)
+ val = iterative_hash_template_arg (TREE_OPERAND (fn, 1), val);
+--- a/gcc/cp/tree.cc
++++ b/gcc/cp/tree.cc
+@@ -2608,6 +2608,18 @@ dependent_name (tree x)
+ return NULL_TREE;
+ }
+
++/* Like dependent_name, but instead takes a CALL_EXPR and also checks
++ its dependence. */
++
++tree
++call_expr_dependent_name (tree x)
++{
++ if (TREE_TYPE (x) != NULL_TREE)
++ /* X isn't dependent, so its callee isn't a dependent name. */
++ return NULL_TREE;
++ return dependent_name (CALL_EXPR_FN (x));
++}
++
+ /* Returns true iff X is an expression for an overloaded function
+ whose type cannot be known without performing overload
+ resolution. */
+@@ -3870,16 +3882,18 @@ decl_internal_context_p (const_tree decl)
+ return !TREE_PUBLIC (decl);
+ }
+
+-/* Subroutine of cp_tree_equal: t1 and t2 are the CALL_EXPR_FNs of two
+- CALL_EXPRS. Return whether they are equivalent. */
++/* Subroutine of cp_tree_equal: t1 and t2 are two CALL_EXPRs.
++ Return whether their CALL_EXPR_FNs are equivalent. */
+
+ static bool
+ called_fns_equal (tree t1, tree t2)
+ {
+ /* Core 1321: dependent names are equivalent even if the overload sets
+ are different. But do compare explicit template arguments. */
+- tree name1 = dependent_name (t1);
+- tree name2 = dependent_name (t2);
++ tree name1 = call_expr_dependent_name (t1);
++ tree name2 = call_expr_dependent_name (t2);
++ t1 = CALL_EXPR_FN (t1);
++ t2 = CALL_EXPR_FN (t2);
+ if (name1 || name2)
+ {
+ tree targs1 = NULL_TREE, targs2 = NULL_TREE;
+@@ -4037,7 +4051,7 @@ cp_tree_equal (tree t1, tree t2)
+ if (KOENIG_LOOKUP_P (t1) != KOENIG_LOOKUP_P (t2))
+ return false;
+
+- if (!called_fns_equal (CALL_EXPR_FN (t1), CALL_EXPR_FN (t2)))
++ if (!called_fns_equal (t1, t2))
+ return false;
+
+ call_expr_arg_iterator iter1, iter2;
+--- /dev/null
++++ b/gcc/testsuite/g++.dg/cpp0x/overload5.C
+@@ -0,0 +1,12 @@
++// PR c++/107461
++// { dg-do compile { target c++11 } }
++
++int f(...);
++template<class T> decltype(T() + f(0)) g(); // #1
++
++char f(int);
++template<class T> decltype(T() + f(0)) g(); // #2, distinct from #1
++
++int main() {
++ g<int>(); // { dg-error "ambiguous" }
++}
+--- /dev/null
++++ b/gcc/testsuite/g++.dg/cpp0x/overload5a.C
+@@ -0,0 +1,10 @@
++// PR c++/107461
++// { dg-do compile { target c++11 } }
++
++template<class T> T f();
++template<class T> decltype(T() + f<int*>()) g(); // #1
++template<class T> decltype(T() + f<char>()) g(); // #2, distinct from #1
++
++int main() {
++ g<int>(); // { dg-error "ambiguous" }
++}
+--- /dev/null
++++ b/gcc/testsuite/g++.dg/cpp0x/overload6.C
+@@ -0,0 +1,16 @@
++// PR c++/107461
++// { dg-do compile { target c++11 } }
++
++template<class T> T f();
++
++template<class> struct A { };
++
++template<class T> struct B {
++ template<class U, class = A<decltype(f<T>()(U()))>>
++ static void g(U);
++};
++
++int main() {
++ B<int> b;
++ B<void(*)(int)>::g(0); // { dg-bogus "no match" }
++}
+--
+2.31.1
diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index 1564ee1..3780f77 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -1,3 +1,6 @@
+7 6 Feb 2023
+ + 75_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch
+
6 30 Jan 2023
U 01_all_default-fortify-source.patch
+ 15_all_DEF_GENTOO_GLIBCXX_ASSERTIONS.patch
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/
@ 2023-02-06 18:36 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-02-06 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 509584e51a55ea61364a88081d11d93062cfd29c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 6 18:35:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 18:35:37 2023 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=509584e5
13.1.0: drop 75_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch (upstream)
Drop now that we created 12.x and 13.x patchsets with this in, as it's
in the git repo now and keeping it in gcc-patches.git will break live
ebuilds.
Will be in next snapshot too as a result.
Signed-off-by: Sam James <sam <AT> gentoo.org>
...07461_cxx_equivalence_non_dependent_calls.patch | 174 ---------------------
1 file changed, 174 deletions(-)
diff --git a/13.1.0/gentoo/75_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch b/13.1.0/gentoo/75_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch
deleted file mode 100644
index 0a421a1..0000000
--- a/13.1.0/gentoo/75_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=31924665c86d47af6b1f22a74f594f2e1dc0ed2d
-(followup to https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=59e0376f607805ef9b67fd7b0a4a3084ab3571a5)
-https://bugs.gentoo.org/893410
-
-From 31924665c86d47af6b1f22a74f594f2e1dc0ed2d Mon Sep 17 00:00:00 2001
-From: Patrick Palka <ppalka@redhat.com>
-Date: Sun, 5 Feb 2023 21:35:33 -0500
-Subject: [PATCH] c++: equivalence of non-dependent calls [PR107461]
-
-After r13-5684-g59e0376f607805 the (pruned) callee of a non-dependent
-CALL_EXPR is a bare FUNCTION_DECL rather than ADDR_EXPR of FUNCTION_DECL.
-This innocent change revealed that cp_tree_equal doesn't first check
-dependence of a CALL_EXPR before treating a FUNCTION_DECL callee as a
-dependent name, which leads to us incorrectly accepting the first two
-testcases below and rejecting the third:
-
- * In the first testcase, cp_tree_equal incorrectly returns true for
- the two non-dependent CALL_EXPRs f(0) and f(0) (whose CALL_EXPR_FN
- are different FUNCTION_DECLs) which causes us to treat #2 as a
- redeclaration of #1.
-
- * Same issue in the second testcase, for f<int*>() and f<char>().
-
- * In the third testcase, cp_tree_equal incorrectly returns true for
- f<int>() and f<void(*)(int)>() which causes us to conflate the two
- dependent specializations A<decltype(f<int>()(U()))> and
- A<decltype(f<void(*)(int)>()(U()))>.
-
-This patch fixes this by making called_fns_equal treat two callees as
-dependent names only if the overall CALL_EXPRs are dependent, via a new
-convenience function call_expr_dependent_name that is like dependent_name
-but also checks dependence of the overall CALL_EXPR.
-
- PR c++/107461
-
-gcc/cp/ChangeLog:
-
- * cp-tree.h (call_expr_dependent_name): Declare.
- * pt.cc (iterative_hash_template_arg) <case CALL_EXPR>: Use
- call_expr_dependent_name instead of dependent_name.
- * tree.cc (call_expr_dependent_name): Define.
- (called_fns_equal): Adjust to take two CALL_EXPRs instead of
- CALL_EXPR_FNs thereof. Use call_expr_dependent_name instead
- of dependent_name.
- (cp_tree_equal) <case CALL_EXPR>: Adjust call to called_fns_equal.
-
-gcc/testsuite/ChangeLog:
-
- * g++.dg/cpp0x/overload5.C: New test.
- * g++.dg/cpp0x/overload5a.C: New test.
- * g++.dg/cpp0x/overload6.C: New test.
---- a/gcc/cp/cp-tree.h
-+++ b/gcc/cp/cp-tree.h
-@@ -7902,6 +7902,7 @@ extern tree lookup_maybe_add (tree fns, tree lookup,
- extern int is_overloaded_fn (tree) ATTRIBUTE_PURE;
- extern bool really_overloaded_fn (tree) ATTRIBUTE_PURE;
- extern tree dependent_name (tree);
-+extern tree call_expr_dependent_name (tree);
- extern tree maybe_get_fns (tree) ATTRIBUTE_PURE;
- extern tree get_fns (tree) ATTRIBUTE_PURE;
- extern tree get_first_fn (tree) ATTRIBUTE_PURE;
---- a/gcc/cp/pt.cc
-+++ b/gcc/cp/pt.cc
-@@ -1841,7 +1841,7 @@ iterative_hash_template_arg (tree arg, hashval_t val)
- case CALL_EXPR:
- {
- tree fn = CALL_EXPR_FN (arg);
-- if (tree name = dependent_name (fn))
-+ if (tree name = call_expr_dependent_name (arg))
- {
- if (TREE_CODE (fn) == TEMPLATE_ID_EXPR)
- val = iterative_hash_template_arg (TREE_OPERAND (fn, 1), val);
---- a/gcc/cp/tree.cc
-+++ b/gcc/cp/tree.cc
-@@ -2608,6 +2608,18 @@ dependent_name (tree x)
- return NULL_TREE;
- }
-
-+/* Like dependent_name, but instead takes a CALL_EXPR and also checks
-+ its dependence. */
-+
-+tree
-+call_expr_dependent_name (tree x)
-+{
-+ if (TREE_TYPE (x) != NULL_TREE)
-+ /* X isn't dependent, so its callee isn't a dependent name. */
-+ return NULL_TREE;
-+ return dependent_name (CALL_EXPR_FN (x));
-+}
-+
- /* Returns true iff X is an expression for an overloaded function
- whose type cannot be known without performing overload
- resolution. */
-@@ -3870,16 +3882,18 @@ decl_internal_context_p (const_tree decl)
- return !TREE_PUBLIC (decl);
- }
-
--/* Subroutine of cp_tree_equal: t1 and t2 are the CALL_EXPR_FNs of two
-- CALL_EXPRS. Return whether they are equivalent. */
-+/* Subroutine of cp_tree_equal: t1 and t2 are two CALL_EXPRs.
-+ Return whether their CALL_EXPR_FNs are equivalent. */
-
- static bool
- called_fns_equal (tree t1, tree t2)
- {
- /* Core 1321: dependent names are equivalent even if the overload sets
- are different. But do compare explicit template arguments. */
-- tree name1 = dependent_name (t1);
-- tree name2 = dependent_name (t2);
-+ tree name1 = call_expr_dependent_name (t1);
-+ tree name2 = call_expr_dependent_name (t2);
-+ t1 = CALL_EXPR_FN (t1);
-+ t2 = CALL_EXPR_FN (t2);
- if (name1 || name2)
- {
- tree targs1 = NULL_TREE, targs2 = NULL_TREE;
-@@ -4037,7 +4051,7 @@ cp_tree_equal (tree t1, tree t2)
- if (KOENIG_LOOKUP_P (t1) != KOENIG_LOOKUP_P (t2))
- return false;
-
-- if (!called_fns_equal (CALL_EXPR_FN (t1), CALL_EXPR_FN (t2)))
-+ if (!called_fns_equal (t1, t2))
- return false;
-
- call_expr_arg_iterator iter1, iter2;
---- /dev/null
-+++ b/gcc/testsuite/g++.dg/cpp0x/overload5.C
-@@ -0,0 +1,12 @@
-+// PR c++/107461
-+// { dg-do compile { target c++11 } }
-+
-+int f(...);
-+template<class T> decltype(T() + f(0)) g(); // #1
-+
-+char f(int);
-+template<class T> decltype(T() + f(0)) g(); // #2, distinct from #1
-+
-+int main() {
-+ g<int>(); // { dg-error "ambiguous" }
-+}
---- /dev/null
-+++ b/gcc/testsuite/g++.dg/cpp0x/overload5a.C
-@@ -0,0 +1,10 @@
-+// PR c++/107461
-+// { dg-do compile { target c++11 } }
-+
-+template<class T> T f();
-+template<class T> decltype(T() + f<int*>()) g(); // #1
-+template<class T> decltype(T() + f<char>()) g(); // #2, distinct from #1
-+
-+int main() {
-+ g<int>(); // { dg-error "ambiguous" }
-+}
---- /dev/null
-+++ b/gcc/testsuite/g++.dg/cpp0x/overload6.C
-@@ -0,0 +1,16 @@
-+// PR c++/107461
-+// { dg-do compile { target c++11 } }
-+
-+template<class T> T f();
-+
-+template<class> struct A { };
-+
-+template<class T> struct B {
-+ template<class U, class = A<decltype(f<T>()(U()))>>
-+ static void g(U);
-+};
-+
-+int main() {
-+ B<int> b;
-+ B<void(*)(int)>::g(0); // { dg-bogus "no match" }
-+}
---
-2.31.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/
@ 2023-02-12 23:18 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-02-12 23:18 UTC (permalink / raw
To: gentoo-commits
commit: bf0284c2cabb418102edbec30bc9134865674c29
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 23:04:42 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 23:04:42 2023 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=bf0284c2
13.1.0: cut 8 patchset
Just drops the merged-upstream 76_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch.
Signed-off-by: Sam James <sam <AT> gentoo.org>
13.1.0/gentoo/README.history | 3 +++
1 file changed, 3 insertions(+)
diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index 3780f77..f0ee005 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -1,3 +1,6 @@
+8 12 Feb 2023
+ - 76_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch
+
7 6 Feb 2023
+ 75_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/
@ 2023-03-13 22:28 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-03-13 22:28 UTC (permalink / raw
To: gentoo-commits
commit: b37b9b3a61f788973ae156a1fcddd0d108879a7b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 21:49:45 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 21:50:51 2023 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=b37b9b3a
13.1.0: don't set _FORTIFY_SOURCE if -fsanitize=address (ASAN) is enabled
This can cause either false positives in warnings from the compiler or false
negatives where the sanitizer misses something.
Bug: https://github.com/google/sanitizers/issues/247
Signed-off-by: Sam James <sam <AT> gentoo.org>
13.1.0/gentoo/01_all_default-fortify-source.patch | 4 ++--
13.1.0/gentoo/README.history | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/13.1.0/gentoo/01_all_default-fortify-source.patch b/13.1.0/gentoo/01_all_default-fortify-source.patch
index 79d6639..4cdf5f6 100644
--- a/13.1.0/gentoo/01_all_default-fortify-source.patch
+++ b/13.1.0/gentoo/01_all_default-fortify-source.patch
@@ -16,8 +16,8 @@ initially Gentoo used too complicated macro.
+ #define GENTOO_FORTIFY_SOURCE_LEVEL 2
+ #endif
+
-+ /* Fortify Source enabled by default for optimization levels > 0 */
-+ if (optimize)
++ /* F_S enabled by default for optimization levels > 0, except for ASAN: https://github.com/google/sanitizers/issues/247 */
++ if (optimize && ! (flag_sanitize & SANITIZE_ADDRESS))
+ builtin_define_with_int_value ("_FORTIFY_SOURCE", GENTOO_FORTIFY_SOURCE_LEVEL);
+#endif
+
diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index f0ee005..efcdcf7 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -1,3 +1,6 @@
+9 13 Mar 2023
+ U 01_all_default-fortify-source.patch
+
8 12 Feb 2023
- 76_all_all_PR107461_cxx_equivalence_non_dependent_calls.patch
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/
@ 2023-04-23 2:41 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-04-23 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 8468b2fa05288d77bed2b59800b3153c71569cae
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 02:34:38 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 02:34:38 2023 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8468b2fa
13.1.0: rebase 26_all_enable-cet.patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
13.1.0/gentoo/26_all_enable-cet.patch | 32 ++++++++++++++++----------------
13.1.0/gentoo/README.history | 1 +
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/13.1.0/gentoo/26_all_enable-cet.patch b/13.1.0/gentoo/26_all_enable-cet.patch
index a6976c4..b13abab 100644
--- a/13.1.0/gentoo/26_all_enable-cet.patch
+++ b/13.1.0/gentoo/26_all_enable-cet.patch
@@ -11,7 +11,7 @@ Needs:
Only supported on amd64.
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ along with GCC; see the file COPYING3. If not see
" %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}"
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
" %{fmodules-ts:-fmodule-header %{fpreprocessed:-fdirectives-only}}"
@@ -20,7 +20,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{!S:-o %g.s%V}"
" %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ along with GCC; see the file COPYING3. If not see
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
" %{fmodules-ts:-fmodule-header=system"
" %{fpreprocessed:-fdirectives-only}}"
@@ -29,7 +29,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{!S:-o %g.s%V}"
" %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ along with GCC; see the file COPYING3. If not see
" %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}"
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
" %{fmodules-ts:-fmodule-header=user %{fpreprocessed:-fdirectives-only}}"
@@ -38,7 +38,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{!S:-o %g.s%V}"
" %{!fmodule-*:%{!fmodules-*:%{!fdump-ada-spec*:"
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ along with GCC; see the file COPYING3. If not see
" cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed"
" %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}"
" %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}"
@@ -47,7 +47,7 @@ Only supported on amd64.
" %{!fsyntax-only:"
" %{fmodule-only:%{!S:-o %g.s%V}}"
" %{!fmodule-only:%(invoke_as)}}"
-@@ -116,7 +116,7 @@
+@@ -116,7 +116,7 @@ along with GCC; see the file COPYING3. If not see
{".ii", "@c++-cpp-output", 0, 0, 0},
{"@c++-cpp-output",
"%{!E:%{!M:%{!MM:"
@@ -58,7 +58,7 @@ Only supported on amd64.
" %{!fmodule-only:%{!fmodule-header*:%(invoke_as)}}}"
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
-@@ -987,6 +987,18 @@
+@@ -994,6 +994,18 @@ proper position among the other output files. */
#define LINK_NOW_SPEC ""
#endif
@@ -77,15 +77,15 @@ Only supported on amd64.
#ifdef ENABLE_DEFAULT_PIE
#define PIE_SPEC "!no-pie"
#define NO_FPIE1_SPEC "fno-pie"
-@@ -1189,6 +1201,7 @@
- static const char *cc1_spec = CC1_SPEC;
+@@ -1196,6 +1208,7 @@ static const char *cpp_spec = CPP_SPEC;
+ static const char *cc1_spec = CC1_SPEC OS_CC1_SPEC;
static const char *cc1plus_spec = CC1PLUS_SPEC;
static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
+static const char *default_flag_cf_spec = DEFAULT_FLAG_CF_SPEC;
static const char *link_ssp_spec = LINK_SSP_SPEC;
static const char *asm_spec = ASM_SPEC;
static const char *asm_final_spec = ASM_FINAL_SPEC;
-@@ -1247,7 +1260,7 @@
+@@ -1254,7 +1267,7 @@ static const char *cpp_options =
"%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
%{f*} %{g*:%{%:debug-level-gt(0):%{g*}\
%{!fno-working-directory:-fworking-directory}}} %{O*}\
@@ -94,7 +94,7 @@ Only supported on amd64.
/* Pass -d* flags, possibly modifying -dumpdir, -dumpbase et al.
-@@ -1440,9 +1453,9 @@
+@@ -1448,9 +1461,9 @@ static const struct compiler default_compilers[] =
%{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
%(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
@@ -106,7 +106,7 @@ Only supported on amd64.
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1},
{"-",
"%{!E:%e-E or -x required when input is from standard input}\
-@@ -1467,7 +1480,7 @@
+@@ -1475,7 +1488,7 @@ static const struct compiler default_compilers[] =
%W{o*:--output-pch %*}}%V}}}}}}}", 0, 0, 0},
{".i", "@cpp-output", 0, 0, 0},
{"@cpp-output",
@@ -115,7 +115,7 @@ Only supported on amd64.
{".s", "@assembler", 0, 0, 0},
{"@assembler",
"%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
-@@ -1699,6 +1712,7 @@
+@@ -1707,6 +1720,7 @@ static struct spec_list static_specs[] =
INIT_STATIC_SPEC ("cc1_options", &cc1_options),
INIT_STATIC_SPEC ("cc1plus", &cc1plus_spec),
INIT_STATIC_SPEC ("link_gcc_c_sequence", &link_gcc_c_sequence_spec),
@@ -125,7 +125,7 @@ Only supported on amd64.
INIT_STATIC_SPEC ("link", &link_spec),
--- a/gcc/objc/lang-specs.h
+++ b/gcc/objc/lang-specs.h
-@@ -29,9 +29,9 @@
+@@ -29,9 +29,9 @@ along with GCC; see the file COPYING3. If not see
%{traditional|traditional-cpp:\
%eGNU Objective C no longer supports traditional compilation}\
%{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
@@ -137,7 +137,7 @@ Only supported on amd64.
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
{"@objective-c-header",
"%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp}\
-@@ -40,18 +40,18 @@
+@@ -40,18 +40,18 @@ along with GCC; see the file COPYING3. If not see
%{traditional|traditional-cpp:\
%eGNU Objective C no longer supports traditional compilation}\
%{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
@@ -162,7 +162,7 @@ Only supported on amd64.
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
--- a/gcc/objcp/lang-specs.h
+++ b/gcc/objcp/lang-specs.h
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ along with GCC; see the file COPYING3. If not see
%(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\
cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\
%{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
@@ -171,7 +171,7 @@ Only supported on amd64.
-o %g.s %{!o*:--output-pch %i.gch} %W{o*:--output-pch %*}%V}}}",
CPLUSPLUS_CPP_SPEC, 0, 0},
{"@objective-c++",
-@@ -46,16 +46,16 @@
+@@ -46,16 +46,16 @@ along with GCC; see the file COPYING3. If not see
%(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\
cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\
%{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index 26027e1..047322a 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -1,4 +1,5 @@
10 23 Apr 2023
+ U 26_all_enable-cet.patch
+ 31_all_gm2_make_P_var.patch
9 13 Mar 2023
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/
@ 2023-04-23 2:41 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-04-23 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 81920212528349b41e7e413592bfb1dbbad68638
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 02:29:34 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 02:29:34 2023 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=81920212
13.1.0: add 31_all_gm2_make_P_var.patch
Bug: https://bugs.gentoo.org/904714
Signed-off-by: Sam James <sam <AT> gentoo.org>
13.1.0/gentoo/31_all_gm2_make_P_var.patch | 49 +++++++++++++++++++++++++++++++
13.1.0/gentoo/README.history | 3 ++
2 files changed, 52 insertions(+)
diff --git a/13.1.0/gentoo/31_all_gm2_make_P_var.patch b/13.1.0/gentoo/31_all_gm2_make_P_var.patch
new file mode 100644
index 0000000..c977874
--- /dev/null
+++ b/13.1.0/gentoo/31_all_gm2_make_P_var.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/904714
+https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=79c73122fab213f218b85b2c579ffe3cf5e98ad0
+
+From 79c73122fab213f218b85b2c579ffe3cf5e98ad0 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Fri, 21 Apr 2023 18:07:29 +0200
+Subject: [PATCH] gcc/m2: Drop references to $(P)
+
+$(P) seems to have been a workaround for some old, proprietary make
+implementations that we no longer support. It was removed in
+r0-31149-gb8dad04b688e9c.
+
+gcc/m2/ChangeLog:
+
+ * Make-lang.in: Remove references to $(P).
+ * Make-maintainer.in: Ditto.
+--- a/gcc/m2/Make-lang.in
++++ b/gcc/m2/Make-lang.in
+@@ -514,7 +514,7 @@ GM2_LIBS_BOOT = m2/gm2-compiler-boot/gm2.a \
+ cc1gm2$(exeext): m2/stage1/cc1gm2$(exeext) $(m2.prev)
+ cp -p $< $@
+
+-m2/stage2/cc1gm2$(exeext): m2/stage1/cc1gm2$(exeext) m2/gm2-compiler/m2flex.o $(P) \
++m2/stage2/cc1gm2$(exeext): m2/stage1/cc1gm2$(exeext) m2/gm2-compiler/m2flex.o \
+ $(GM2_C_OBJS) $(BACKEND) $(LIBDEPS) $(GM2_LIBS) \
+ m2/gm2-gcc/rtegraph.o plugin/m2rte$(soext)
+ -test -d $(@D) || $(mkinstalldirs) $(@D)
+@@ -527,7 +527,7 @@ m2/stage2/cc1gm2$(exeext): m2/stage1/cc1gm2$(exeext) m2/gm2-compiler/m2flex.o $(
+ @$(call LINK_PROGRESS,$(INDEX.m2),end)
+
+ m2/stage1/cc1gm2$(exeext): gm2$(exeext) m2/gm2-compiler-boot/m2flex.o \
+- $(P) $(GM2_C_OBJS) $(BACKEND) $(LIBDEPS) \
++ $(GM2_C_OBJS) $(BACKEND) $(LIBDEPS) \
+ $(GM2_LIBS_BOOT) $(MC_LIBS) \
+ m2/gm2-gcc/rtegraph.o plugin/m2rte$(soext) \
+ $(m2.prev)
+--- a/gcc/m2/Make-maintainer.in
++++ b/gcc/m2/Make-maintainer.in
+@@ -753,7 +753,7 @@ GM2_LIBS_PARANOID = m2/gm2-compiler-paranoid/gm2.a \
+ gm2.paranoid: m2/m2obj3/cc1gm2$(exeext) gm2.verifyparanoid
+
+ m2/m2obj3/cc1gm2$(exeext): m2/m2obj2/cc1gm2$(exeext) m2/gm2-compiler-paranoid/m2flex.o \
+- $(P) $(GM2_C_OBJS) $(BACKEND) $(LIBDEPS) $(GM2_LIBS_PARANOID) \
++ $(GM2_C_OBJS) $(BACKEND) $(LIBDEPS) $(GM2_LIBS_PARANOID) \
+ m2/gm2-gcc/rtegraph.o plugin/m2rte$(exeext).so m2/gm2-libs-boot/M2LINK.o
+ -test -d m2/m2obj3 || $(mkinstalldirs) m2/m2obj3
+ @$(call LINK_PROGRESS,$(INDEX.m2),start)
+--
+2.31.1
diff --git a/13.1.0/gentoo/README.history b/13.1.0/gentoo/README.history
index efcdcf7..26027e1 100644
--- a/13.1.0/gentoo/README.history
+++ b/13.1.0/gentoo/README.history
@@ -1,3 +1,6 @@
+10 23 Apr 2023
+ + 31_all_gm2_make_P_var.patch
+
9 13 Mar 2023
U 01_all_default-fortify-source.patch
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-04-23 2:41 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-30 4:21 [gentoo-commits] proj/gcc-patches:master commit in: 13.1.0/gentoo/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-04-23 2:41 Sam James
2023-04-23 2:41 Sam James
2023-03-13 22:28 Sam James
2023-02-12 23:18 Sam James
2023-02-06 18:36 Sam James
2023-02-06 17:40 Sam James
2022-12-17 4:54 Sam James
2022-11-29 13:21 David Seifert
2022-11-28 22:38 Andreas K. Hüttel
2022-11-02 17:07 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox