'#include "tm_p.h"' in 'gcc/rust/backend/rust-tree.cc' (was: [gcc r13-5533] gccrs: const folding port)

[Thomas Schwinge <thomas@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

Hi!

On 2023-01-31T13:14:10+0000, Arthur Cohen via Gcc-cvs <gcc-cvs@gcc.gnu.org> wrote:
> commit r13-5533-ge66fec8e6ba35edf01f86c2bf6514109aba4ded2
> Author: Faisal Abbas <90.abbasfaisal@gmail.com>
> Date:   Mon Jun 27 16:05:49 2022 +0100
>
>     gccrs: const folding port

> --- a/gcc/rust/backend/rust-tree.cc
> +++ b/gcc/rust/backend/rust-tree.cc
> @@ -21,12 +21,37 @@
>  #include "stringpool.h"
>  #include "attribs.h"
>  #include "escaped_string.h"
> +#include "libiberty.h"
> +#include "stor-layout.h"
> +#include "hash-map.h"
> +#include "diagnostic.h"
> +#include "timevar.h"
> +#include "convert.h"
> +#include "gimple-expr.h"
> +#include "gimplify.h"
> +#include "function.h"
> +#include "gcc-rich-location.h"
> +#include "target.h"
> +#include "file-prefix-map.h"
> +#include "cgraph.h"
> +
> +#include "output.h"

GCC's '#include' is a m...ystery -- I've pushed to master branch
commit 27a89f84c458ae938bc3eb92ad0d594c06fc3b42
"'#include "tm_p.h"' in 'gcc/rust/backend/rust-tree.cc'", see attached.


Grüße
 Thomas


-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955

[-- Attachment #2: 0001-include-tm_p.h-in-gcc-rust-backend-rust-tree.cc.patch --]
[-- Type: text/x-diff, Size: 3868 bytes --]

From 27a89f84c458ae938bc3eb92ad0d594c06fc3b42 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Fri, 17 Feb 2023 23:36:20 +0100
Subject: [PATCH] '#include "tm_p.h"' in 'gcc/rust/backend/rust-tree.cc'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

... to resolve issues like:

<https://github.com/Rust-GCC/gccrs/issues/1864> "Upstream GCC broken for --target=pdp11-aout":

    In file included from ./tm.h:18:0,
                     from [...]/gcc/target.h:52,
                     from [...]/gcc/rust/backend/rust-tree.cc:34:
    [...]/gcc/rust/backend/rust-tree.cc: In function ‘void Rust::mark_exp_read(tree)’:
    [...]/gcc/config/pdp11/pdp11.h:572:48: error: ‘pdp11_gen_int_label’ was not declared in this scope
       pdp11_gen_int_label ((LABEL), (PREFIX), (NUM))
                                                    ^
    [...]/gcc/rust/backend/rust-tree.cc:53:3: note: in expansion of macro ‘ASM_GENERATE_INTERNAL_LABEL’
       ASM_GENERATE_INTERNAL_LABEL (tmp_name, "Lsrc_loc", 1);
       ^
    [...]/gcc/rust/backend/rust-tree.cc: In function ‘tree_node* Rust::fold_builtin_source_location(location_t)’:
    [...]/gcc/config/pdp11/pdp11.h:572:48: error: ‘pdp11_gen_int_label’ was not declared in this scope
       pdp11_gen_int_label ((LABEL), (PREFIX), (NUM))
                                                    ^
    [...]/gcc/rust/backend/rust-tree.cc:4799:7: note: in expansion of macro ‘ASM_GENERATE_INTERNAL_LABEL’
           ASM_GENERATE_INTERNAL_LABEL (tmp_name, "Lsrc_loc", source_location_id++);
           ^
    make[1]: *** [rust/rust-tree.o] Error 1

<https://github.com/Rust-GCC/gccrs/issues/1819> "New build failure on upstream GCC for --target=powerpc-ibm-aix7.{1,2}":

    In file included from ./tm.h:22:0,
                     from [...]/gcc/target.h:52,
                     from [...]/gcc/rust/backend/rust-tree.cc:34:
    [...]/gcc/rust/backend/rust-tree.cc: In function ‘void Rust::mark_exp_read(tree)’:
    [...]/gcc/config/rs6000/xcoff.h:206:63: error: ‘rs6000_xcoff_strip_dollar’ was not declared in this scope
       sprintf (LABEL, "*%s..%u", rs6000_xcoff_strip_dollar (PREFIX), (unsigned) (NUM))
                                                                   ^
    [...]/gcc/rust/backend/rust-tree.cc:53:3: note: in expansion of macro ‘ASM_GENERATE_INTERNAL_LABEL’
       ASM_GENERATE_INTERNAL_LABEL (tmp_name, "Lsrc_loc", 1);
       ^
    [...]/gcc/rust/backend/rust-tree.cc: In function ‘tree_node* Rust::fold_builtin_source_location(location_t)’:
    [...]/gcc/config/rs6000/xcoff.h:206:63: error: ‘rs6000_xcoff_strip_dollar’ was not declared in this scope
       sprintf (LABEL, "*%s..%u", rs6000_xcoff_strip_dollar (PREFIX), (unsigned) (NUM))
                                                                   ^
    [...]/gcc/rust/backend/rust-tree.cc:4799:7: note: in expansion of macro ‘ASM_GENERATE_INTERNAL_LABEL’
           ASM_GENERATE_INTERNAL_LABEL (tmp_name, "Lsrc_loc", source_location_id++);
           ^
    make[1]: *** [rust/rust-tree.o] Error 1

Fix-up for recent commit e66fec8e6ba35edf01f86c2bf6514109aba4ded2
"gccrs: const folding port".

	gcc/rust/
	* backend/rust-tree.cc: '#include "tm_p.h"'.
---
 gcc/rust/backend/rust-tree.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/rust/backend/rust-tree.cc b/gcc/rust/backend/rust-tree.cc
index 47506d6792a..e2595b59aa8 100644
--- a/gcc/rust/backend/rust-tree.cc
+++ b/gcc/rust/backend/rust-tree.cc
@@ -34,8 +34,8 @@
 #include "target.h"
 #include "file-prefix-map.h"
 #include "cgraph.h"
-
 #include "output.h"
+#include "tm_p.h"
 
 // forked from gcc/c-family/c-common.cc c_global_trees
 tree c_global_trees[CTI_MAX];
-- 
2.25.1