Hi!
On 2022-01-10T09:41:08+0000, Pierre-Marie de Rodat via Gcc-cvs
<gcc-...@gcc.gnu.org> wrote:
> https://gcc.gnu.org/g:a6eae6a9bbf83ada3aab7f5a2a74e7024889d237
>
> commit r12-6398-ga6eae6a9bbf83ada3aab7f5a2a74e7024889d237
> Author: Arnaud Charlet <char...@adacore.com>
> Date: Mon Nov 29 10:15:26 2021 +0000
>
> [Ada] Reduce runtime dependencies on stage1
>
> gcc/ada/
>
> * gcc-interface/Make-lang.in (ADA_GENERATED_FILES): Remove
> s-casuti.ad?, s-crtl.ad?, s-os_lib.ad?. Update list of object
> files accordingly.
OK to push (after more testing) the attached
'Revert parts of "[Ada] Reduce runtime dependencies on stage1"', for the
reason detailed therein? Should the comment before 'GNAT1_C_OBJS' be
re-instated/adjusted, too? Would appreciate a careful review, as I don't
really know what I'm doing there. ;-)
Grüße
Thomas
> Diff:
> ---
> gcc/ada/gcc-interface/Make-lang.in | 55
> ++++++++++++++++++--------------------
> 1 file changed, 26 insertions(+), 29 deletions(-)
>
> diff --git a/gcc/ada/gcc-interface/Make-lang.in
> b/gcc/ada/gcc-interface/Make-lang.in
> index c6d8134b12b..40e7a9f670c 100644
> --- a/gcc/ada/gcc-interface/Make-lang.in
> +++ b/gcc/ada/gcc-interface/Make-lang.in
> @@ -271,8 +271,7 @@ GCC_LLINK=$(LLINKER) $(GCC_LINKERFLAGS) $(LDFLAGS)
> # Languages-specific object files for Ada.
>
> # Object files from C sources that are used by gnat1
> -# Most of the non-gigi files are needed because of s-crtl.o and s-os_lib.o
> -# But adadecode.o should not be needed with sufficiently recent compilers
> +# adadecode.o should not be needed with sufficiently recent compilers
> GNAT1_C_OBJS = \
> ada/cuintp.o \
> ada/decl.o \
> @@ -281,15 +280,9 @@ GNAT1_C_OBJS = \
> ada/utils2.o \
> ada/trans.o \
> ada/targtyps.o \
> - ada/adadecode.o \
> - ada/adaint.o \
> - ada/argv.o \
> - ada/cio.o \
> - ada/cstreams.o \
> - ada/env.o \
> - ada/errno.o \
> + ada/version.o \
> ada/targext.o \
> - ada/version.o
> + ada/adadecode.o
>
> # Object files from Ada sources that are used by gnat1
> GNAT_ADA_OBJS = \
> @@ -465,14 +458,17 @@ GNAT_ADA_OBJS = \
> ada/g-graphs.o \
> ada/g-lists.o \
> ada/g-sets.o \
> - ada/s-casuti.o \
> - ada/s-crtl.o \
> - ada/s-os_lib.o \
> ada/s-pehage.o \
> ada/s-utf_32.o
>
> ifeq ($(STAGE1),False)
> GNAT1_C_OBJS+= \
> + ada/adaint.o \
> + ada/argv.o \
> + ada/cio.o \
> + ada/cstreams.o \
> + ada/env.o \
> + ada/errno.o \
> ada/init.o \
> ada/initialize.o \
> ada/raise.o \
> @@ -504,6 +500,8 @@ GNAT_ADA_OBJS+= \
> ada/libgnat/s-assert.o \
> ada/libgnat/s-bitops.o \
> ada/libgnat/s-carun8.o \
> + ada/libgnat/s-casuti.o \
> + ada/libgnat/s-crtl.o \
> ada/libgnat/s-conca2.o \
> ada/libgnat/s-conca3.o \
> ada/libgnat/s-conca4.o \
> @@ -521,6 +519,7 @@ GNAT_ADA_OBJS+= \
> ada/libgnat/s-imgint.o \
> ada/libgnat/s-mastop.o \
> ada/libgnat/s-memory.o \
> + ada/libgnat/s-os_lib.o \
> ada/libgnat/s-parame.o \
> ada/libgnat/s-purexc.o \
> ada/libgnat/s-restri.o \
> @@ -621,6 +620,7 @@ GNATBIND_OBJS = \
> ada/switch-b.o \
> ada/switch.o \
> ada/table.o \
> + ada/targext.o \
> ada/targparm.o \
> ada/types.o \
> ada/uintp.o \
> @@ -632,18 +632,9 @@ GNATBIND_OBJS = \
> ada/g-lists.o \
> ada/g-graphs.o \
> ada/g-sets.o \
> - ada/s-casuti.o \
> - ada/s-os_lib.o \
> ada/s-resfil.o \
> - ada/s-utf_32.o \
> - ada/adaint.o \
> - ada/argv.o \
> - ada/cio.o \
> - ada/cstreams.o \
> - ada/env.o \
> - ada/errno.o \
> - ada/targext.o \
> - ada/version.o
> + ada/version.o \
> + ada/s-utf_32.o
>
> ifeq ($(STAGE1),False)
> GNATBIND_OBJS += \
> @@ -666,6 +657,7 @@ GNATBIND_OBJS += \
> ada/libgnat/s-addope.o \
> ada/libgnat/s-assert.o \
> ada/libgnat/s-carun8.o \
> + ada/libgnat/s-casuti.o \
> ada/libgnat/s-conca2.o \
> ada/libgnat/s-conca3.o \
> ada/libgnat/s-conca4.o \
> @@ -683,6 +675,7 @@ GNATBIND_OBJS += \
> ada/libgnat/s-imgint.o \
> ada/libgnat/s-mastop.o \
> ada/libgnat/s-memory.o \
> + ada/libgnat/s-os_lib.o \
> ada/libgnat/s-parame.o \
> ada/libgnat/s-restri.o \
> ada/libgnat/s-secsta.o \
> @@ -699,7 +692,13 @@ GNATBIND_OBJS += \
> ada/libgnat/s-wchcnv.o \
> ada/libgnat/s-wchcon.o \
> ada/libgnat/s-wchjis.o \
> - ada/libgnat/s-wchstw.o
> + ada/libgnat/s-wchstw.o \
> + ada/adaint.o \
> + ada/argv.o \
> + ada/cio.o \
> + ada/cstreams.o \
> + ada/env.o \
> + ada/errno.o
> endif
>
> # Language-independent object files.
> @@ -1186,10 +1185,8 @@ ADA_GENERATED_FILES = \
> ada/gnat.ads ada/g-dynhta.ads ada/g-dynhta.adb \
> ada/g-dyntab.ads ada/g-dyntab.adb ada/g-graphs.ads ada/g-graphs.adb \
> ada/g-lists.ads ada/g-lists.adb ada/g-sets.ads ada/g-sets.adb \
> - ada/s-casuti.ads ada/s-casuti.adb \
> - ada/s-crtl.ads ada/s-rident.ads ada/s-pehage.ads ada/s-pehage.adb \
> - ada/s-os_lib.ads ada/s-os_lib.adb ada/s-resfil.ads ada/s-resfil.adb \
> - ada/s-utf_32.ads ada/s-utf_32.adb
> + ada/s-rident.ads ada/s-pehage.ads ada/s-pehage.adb \
> + ada/s-resfil.ads ada/s-resfil.adb ada/s-utf_32.ads ada/s-utf_32.adb
>
> # Only used to manually trigger the creation of the generated files.
> .PHONY:
-----------------
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
>From d89b21968dd813ecc3357ba6d63633bcce3a409d Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tho...@codesourcery.com>
Date: Tue, 18 Jan 2022 00:01:01 +0100
Subject: [PATCH] Revert parts of "[Ada] Reduce runtime dependencies on stage1"
... to avoid:
[...]
mkdir -p ada/
gcc-4.8 -std=gnu99 -c -g -O2 -gnatpg -gnatwns -gnata -W -Wall -I- -I. -Iada/generated -Iada -I[...]/source-gcc/gcc/ada [...]/source-gcc/gcc/ada/osint.adb -o ada/osint.o
osint.adb:438:31: "strlen" not declared in "CRTL"
osint.adb:441:14: "strncpy" not declared in "CRTL"
osint.adb:675:21: "strlen" not declared in "CRTL"
osint.adb:728:16: "Open_Append" is undefined
osint.adb:1108:41: "int64" not declared in "CRTL"
osint.adb:3126:28: "strlen" not declared in "CRTL"
osint.adb:3129:11: "strncpy" not declared in "CRTL"
make[1]: *** [ada/osint.o] Error 1
mkdir -p ada/
gcc-4.8 -std=gnu99 -c -g -O2 -gnatpg -gnatwns -gnata -W -Wall -I- -I. -Iada/generated -Iada -I[...]/source-gcc/gcc/ada [...]/source-gcc/gcc/ada/gnat1drv.adb -o ada/gnat1drv.o
gnat1drv.adb:1121:44: "Current_Time_String" not declared in "OS_Lib"
gnat1drv.adb:1381:10: (style) misplaced "then"
make[1]: *** [ada/gnat1drv.o] Error 1
make[1]: Target `all' not remade because of errors.
make[1]: Leaving directory `[...]/build-gcc/gcc'
make: *** [all-gcc] Error 2
$ gcc-4.8 --version | head -n 1
gcc-4.8 (Ubuntu 4.8.4-2ubuntu1~14.04.4) 4.8.4
This reverts parts of commit a6eae6a9bbf83ada3aab7f5a2a74e7024889d237.
gcc/ada/
* gcc-interface/Make-lang.in (ADA_GENERATED_FILES): Add back
s-crtl.ad?, s-os_lib.ad?. Update list of object files accordingly.
---
gcc/ada/gcc-interface/Make-lang.in | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index 40e7a9f670c..7dabaae4ed0 100644
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -282,7 +282,8 @@ GNAT1_C_OBJS = \
ada/targtyps.o \
ada/version.o \
ada/targext.o \
- ada/adadecode.o
+ ada/adadecode.o \
+ ada/adaint.o
# Object files from Ada sources that are used by gnat1
GNAT_ADA_OBJS = \
@@ -458,12 +459,13 @@ GNAT_ADA_OBJS = \
ada/g-graphs.o \
ada/g-lists.o \
ada/g-sets.o \
+ ada/s-crtl.o \
+ ada/s-os_lib.o \
ada/s-pehage.o \
ada/s-utf_32.o
ifeq ($(STAGE1),False)
GNAT1_C_OBJS+= \
- ada/adaint.o \
ada/argv.o \
ada/cio.o \
ada/cstreams.o \
@@ -501,7 +503,6 @@ GNAT_ADA_OBJS+= \
ada/libgnat/s-bitops.o \
ada/libgnat/s-carun8.o \
ada/libgnat/s-casuti.o \
- ada/libgnat/s-crtl.o \
ada/libgnat/s-conca2.o \
ada/libgnat/s-conca3.o \
ada/libgnat/s-conca4.o \
@@ -519,7 +520,6 @@ GNAT_ADA_OBJS+= \
ada/libgnat/s-imgint.o \
ada/libgnat/s-mastop.o \
ada/libgnat/s-memory.o \
- ada/libgnat/s-os_lib.o \
ada/libgnat/s-parame.o \
ada/libgnat/s-purexc.o \
ada/libgnat/s-restri.o \
@@ -632,9 +632,11 @@ GNATBIND_OBJS = \
ada/g-lists.o \
ada/g-graphs.o \
ada/g-sets.o \
+ ada/s-os_lib.o \
ada/s-resfil.o \
ada/version.o \
- ada/s-utf_32.o
+ ada/s-utf_32.o \
+ ada/adaint.o
ifeq ($(STAGE1),False)
GNATBIND_OBJS += \
@@ -675,7 +677,6 @@ GNATBIND_OBJS += \
ada/libgnat/s-imgint.o \
ada/libgnat/s-mastop.o \
ada/libgnat/s-memory.o \
- ada/libgnat/s-os_lib.o \
ada/libgnat/s-parame.o \
ada/libgnat/s-restri.o \
ada/libgnat/s-secsta.o \
@@ -693,7 +694,6 @@ GNATBIND_OBJS += \
ada/libgnat/s-wchcon.o \
ada/libgnat/s-wchjis.o \
ada/libgnat/s-wchstw.o \
- ada/adaint.o \
ada/argv.o \
ada/cio.o \
ada/cstreams.o \
@@ -1185,7 +1185,8 @@ ADA_GENERATED_FILES = \
ada/gnat.ads ada/g-dynhta.ads ada/g-dynhta.adb \
ada/g-dyntab.ads ada/g-dyntab.adb ada/g-graphs.ads ada/g-graphs.adb \
ada/g-lists.ads ada/g-lists.adb ada/g-sets.ads ada/g-sets.adb \
- ada/s-rident.ads ada/s-pehage.ads ada/s-pehage.adb \
+ ada/s-crtl.ads ada/s-rident.ads ada/s-pehage.ads ada/s-pehage.adb \
+ ada/s-os_lib.ads ada/s-os_lib.adb \
ada/s-resfil.ads ada/s-resfil.adb ada/s-utf_32.ads ada/s-utf_32.adb
# Only used to manually trigger the creation of the generated files.
--
2.25.1
