From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by sourceware.org (Postfix) with ESMTPS id DC05E3858D20 for ; Fri, 21 Apr 2023 17:39:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC05E3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=aarsen.me Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=aarsen.me Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Q31xm4rGKz9sRD; Fri, 21 Apr 2023 19:39:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1682098796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=etoHhZwKUx8GAZA+VzLOt81VkL5RRh/QYmGvFk+7MrU=; b=aGDuXNpzXz81bv3MSYsREohwDVBz65NL4pz7xo3MgGZSBWCosUQxuXaSwPLdK1e++1HiFP TUcNtSy7cbI6b4O2rAi/s6Oy5zqjcFHE+qcv6nVMQkjvkc5ucsk/62wyJp5tqx6GRM6x7O 2CKrwbMHF+0IUqpnlB0YaPR8usElc2ObsiMV6qJb80XCfV0oV8AQ9k7BRg75NQFUtcCKqM z0gp4zjbE6E1tmKXy3KjXgpZ+eJzf4dBBM6pNzIN3QjpHYWKPssrGn2YS2TWjp8riw6MIw 8KID0tehR3Q5qkQoTlIq+G9DiZ0asFmACVZ3vKVbRRqeXaXftI1SvFm6EckO7g== From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= To: gcc-patches@gcc.gnu.org Cc: gaiusmod2@gmail.com, jakub@redhat.com, rguenther@suse.de, =?UTF-8?q?Arsen=20Arsenovi=C4=87?= Subject: [PATCH] gcc/m2: Drop references to $(P) Date: Fri, 21 Apr 2023 19:38:04 +0200 Message-Id: <20230421173804.3513130-1-arsen@aarsen.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_INFOUSMEBIZ,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: $(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. --- Hi, We spotted that the m2 makefile includes some long-gone compatibility variable $(P), presumably left over from when m2 was not in the tree yet. This induced a build failure on our end: https://bugs.gentoo.org/904714 Build-tested on x86_64-pc-linux-gnu. I haven't finished running the testsuite. I believe this only ever expands to an empty string (if not set by the env) in the current build system, so in theory, it should be safe. OK for gcc-13 and trunk (with a priority on the former)? gcc/m2/Make-lang.in | 4 ++-- gcc/m2/Make-maintainer.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in index b34db0d9156..d0fa692e5b8 100644 --- 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) diff --git a/gcc/m2/Make-maintainer.in b/gcc/m2/Make-maintainer.in index 17bd9a2d37e..a70682673cd 100644 --- 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.40.0