https://gcc.gnu.org/g:ce6480029c2bcc78e051a02e557bcfca2ec75477
commit r17-4361-gce6480029c2bcc78e051a02e557bcfca2ec75477 Author: Gaius Mulley <[email protected]> Date: Wed Sep 16 13:50:18 2026 +0100 PR modula2/127359: Bugfix ensure makeSystem is posix compliant This patch ensures that echo is replaced by equivalent printf posix commands. The invocation of makeSystem from the Makefiles under libgm2 are achieved through $(SHELL). gcc/m2/ChangeLog: PR modula2/127359 * tools-src/makeSystem: Replace echo with printf equivalent. libgm2/ChangeLog: PR modula2/127359 * libm2cor/Makefile.am: Use $(SHELL) to invoke makeSystem. * libm2iso/Makefile.am: Ditto. * libm2min/Makefile.am: Ditto. * libm2pim/Makefile.am: Ditto. * libm2pim/Makefile.in: Rebuild. * libm2cor/Makefile.in: Ditto. * libm2iso/Makefile.in: Ditto. * libm2min/Makefile.in: Ditto. Signed-off-by: Gaius Mulley <[email protected]> Diff: --- gcc/m2/tools-src/makeSystem | 10 +++++----- libgm2/libm2cor/Makefile.am | 2 +- libgm2/libm2cor/Makefile.in | 2 +- libgm2/libm2iso/Makefile.am | 2 +- libgm2/libm2iso/Makefile.in | 2 +- libgm2/libm2min/Makefile.am | 2 +- libgm2/libm2min/Makefile.in | 2 +- libgm2/libm2pim/Makefile.am | 2 +- libgm2/libm2pim/Makefile.in | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gcc/m2/tools-src/makeSystem b/gcc/m2/tools-src/makeSystem index 8adebd700ed6..b07656768860 100644 --- a/gcc/m2/tools-src/makeSystem +++ b/gcc/m2/tools-src/makeSystem @@ -70,22 +70,22 @@ displayExportedTypes () { for i in ${types} ; do if [ $n -eq 1 ] ; then n=0 - echo -n " " >> ${OUTPUTFILE} + printf " " >> ${OUTPUTFILE} fi - echo -n "$i, " >> ${OUTPUTFILE} + printf "$i, " >> ${OUTPUTFILE} if [ $c -eq 4 ] ; then - echo " " >> ${OUTPUTFILE} + printf "\n" >> ${OUTPUTFILE} n=1 c=0 fi c=`expr $c + 1` done - echo " " >> ${OUTPUTFILE} + printf "\n" >> ${OUTPUTFILE} } displayBuiltinTypes () { for i in ${types} ; do - echo " $i ; " >> ${OUTPUTFILE} + printf " $i ; " >> ${OUTPUTFILE} done } diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am index 26d38dc7f4d6..d324055257e5 100644 --- a/libgm2/libm2cor/Makefile.am +++ b/libgm2/libm2cor/Makefile.am @@ -143,7 +143,7 @@ CLEANFILES = SYSTEM.def M2LIBDIR = /m2/m2cor/ SYSTEM.def: Makefile - sh $(GM2_SRC)/tools-src/makeSystem -fpim \ + $(SHELL) $(GM2_SRC)/tools-src/makeSystem -fpim \ $(GM2_SRC)/gm2-libs-cor-common/SYSTEM.def \ $(GM2_SRC)/gm2-libs-cor-common/SYSTEM.mod \ -I$(GM2_SRC)/gm2-libs-cor-common \ diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in index 8287896cbc4f..9781e1f436a3 100644 --- a/libgm2/libm2cor/Makefile.in +++ b/libgm2/libm2cor/Makefile.in @@ -824,7 +824,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @[email protected]: Makefile -@BUILD_CORLIB_TRUE@ sh $(GM2_SRC)/tools-src/makeSystem -fpim \ +@BUILD_CORLIB_TRUE@ $(SHELL) $(GM2_SRC)/tools-src/makeSystem -fpim \ @BUILD_CORLIB_TRUE@ $(GM2_SRC)/gm2-libs-cor-common/SYSTEM.def \ @BUILD_CORLIB_TRUE@ $(GM2_SRC)/gm2-libs-cor-common/SYSTEM.mod \ @BUILD_CORLIB_TRUE@ -I$(GM2_SRC)/gm2-libs-cor-common \ diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am index a73d35d1c0b5..45b3c4ab9659 100644 --- a/libgm2/libm2iso/Makefile.am +++ b/libgm2/libm2iso/Makefile.am @@ -253,7 +253,7 @@ SYSTEM.def: Makefile -C="$(GM2_FOR_TARGET)" -o $@ else SYSTEM.def: Makefile - sh $(GM2_SRC)/tools-src/makeSystem -fiso \ + $(SHELL) $(GM2_SRC)/tools-src/makeSystem -fiso \ $(GM2_SRC)/gm2-libs-iso-common/SYSTEM.def \ $(GM2_SRC)/gm2-libs-iso-common/SYSTEM.mod \ -I$(GM2_SRC)/gm2-libs-iso \ diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index a58928a0cf7a..73bead4999cf 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -965,7 +965,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@ -I=$(GM2_SRC)/gm2-libs-iso-common \ @BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@ -C="$(GM2_FOR_TARGET)" -o $@ @BUILD_ISOLIB_TRUE@@[email protected]: Makefile -@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ sh $(GM2_SRC)/tools-src/makeSystem -fiso \ +@BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ $(SHELL) $(GM2_SRC)/tools-src/makeSystem -fiso \ @BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ $(GM2_SRC)/gm2-libs-iso-common/SYSTEM.def \ @BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ $(GM2_SRC)/gm2-libs-iso-common/SYSTEM.mod \ @BUILD_ISOLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ -I$(GM2_SRC)/gm2-libs-iso \ diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am index 47fa41644783..bd64fff97fa6 100644 --- a/libgm2/libm2min/Makefile.am +++ b/libgm2/libm2min/Makefile.am @@ -141,7 +141,7 @@ SYSTEM.def: Makefile -C="$(GM2_FOR_TARGET) -fno-exceptions" -o $@ else SYSTEM.def: Makefile - sh $(GM2_SRC)/tools-src/makeSystem -fpim \ + $(SHELL) $(GM2_SRC)/tools-src/makeSystem -fpim \ $(GM2_SRC)/gm2-libs-min/SYSTEM.def \ $(GM2_SRC)/gm2-libs-min/SYSTEM.mod \ -I$(GM2_SRC)/gm2-libs-min -I$(GM2_SRC)/gm2-libs \ diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in index 12fe0322649f..f664754f18ea 100644 --- a/libgm2/libm2min/Makefile.in +++ b/libgm2/libm2min/Makefile.in @@ -781,7 +781,7 @@ libc.o: $(GM2_SRC)/gm2-libs-min/libc.c @HAVE_PYTHON_INTERPRETER_TRUE@ -I=$(GM2_SRC)/gm2-libs-min -I=$(GM2_SRC)/gm2-libs \ @HAVE_PYTHON_INTERPRETER_TRUE@ -C="$(GM2_FOR_TARGET) -fno-exceptions" -o $@ @[email protected]: Makefile -@HAVE_PYTHON_INTERPRETER_FALSE@ sh $(GM2_SRC)/tools-src/makeSystem -fpim \ +@HAVE_PYTHON_INTERPRETER_FALSE@ $(SHELL) $(GM2_SRC)/tools-src/makeSystem -fpim \ @HAVE_PYTHON_INTERPRETER_FALSE@ $(GM2_SRC)/gm2-libs-min/SYSTEM.def \ @HAVE_PYTHON_INTERPRETER_FALSE@ $(GM2_SRC)/gm2-libs-min/SYSTEM.mod \ @HAVE_PYTHON_INTERPRETER_FALSE@ -I$(GM2_SRC)/gm2-libs-min -I$(GM2_SRC)/gm2-libs \ diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am index 4bf52343a21b..2f92672558f3 100644 --- a/libgm2/libm2pim/Makefile.am +++ b/libgm2/libm2pim/Makefile.am @@ -228,7 +228,7 @@ SYSTEM.def: Makefile -C="$(GM2_FOR_TARGET)" -o $@ else SYSTEM.def: Makefile - sh $(GM2_SRC)/tools-src/makeSystem -fpim \ + $(SHELL) $(GM2_SRC)/tools-src/makeSystem -fpim \ $(GM2_SRC)/gm2-libs-pim-common/SYSTEM.def \ $(GM2_SRC)/gm2-libs-pim-common/SYSTEM.mod \ -I$(GM2_SRC)/gm2-libs-pim-common \ diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in index b985eec1084f..04e60277e71f 100644 --- a/libgm2/libm2pim/Makefile.in +++ b/libgm2/libm2pim/Makefile.in @@ -940,7 +940,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@ -I=$(GM2_SRC)/gm2-libs \ @BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_TRUE@ -C="$(GM2_FOR_TARGET)" -o $@ @BUILD_PIMLIB_TRUE@@[email protected]: Makefile -@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ sh $(GM2_SRC)/tools-src/makeSystem -fpim \ +@BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ $(SHELL) $(GM2_SRC)/tools-src/makeSystem -fpim \ @BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ $(GM2_SRC)/gm2-libs-pim-common/SYSTEM.def \ @BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ $(GM2_SRC)/gm2-libs-pim-common/SYSTEM.mod \ @BUILD_PIMLIB_TRUE@@HAVE_PYTHON_INTERPRETER_FALSE@ -I$(GM2_SRC)/gm2-libs-pim-common \
