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?= <ar...@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
 

Reply via email to