[gcc r14-6100] PR modula2/112825: modula2 builds target objects as part of all-gcc

Gaius Mulley gaius@gcc.gnu.org
Mon Dec 4 01:36:10 GMT 2023


https://gcc.gnu.org/g:4e5f5a8ae82c5f4f714102d2437175ec366f644c

commit r14-6100-g4e5f5a8ae82c5f4f714102d2437175ec366f644c
Author: Gaius Mulley <gaiusmod2@gmail.com>
Date:   Mon Dec 4 01:35:46 2023 +0000

    PR modula2/112825: modula2 builds target objects as part of all-gcc
    
    This patch fixes the PR modula2/112825 which fails if the target
    assembler is not present on the host.  This can be seen if the
    build invokes make all-gcc.  m2 should not attempt to generate
    target libraries when performing make all-gcc.
    
    Prior to this patch it generated build/gcc/m2/gm2-libs/SYSTSEM.def
    using the script gcc/m2/tools-src/makeSystem (and gm2 -c).
    makeSystem should exec gm2 -S instead (and other flags)
    to generate the list of target data types without requiring any
    target tools.  The target types emitted are textually converted
    into SYSTEM.def.
    
    gcc/m2/ChangeLog:
    
            PR modula2/112825
            * tools-src/makeSystem: Change all occurrences of -c to -S.
    
    Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>

Diff:
---
 gcc/m2/tools-src/makeSystem | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/m2/tools-src/makeSystem b/gcc/m2/tools-src/makeSystem
index b1156b559b0..5f162da8fa8 100644
--- a/gcc/m2/tools-src/makeSystem
+++ b/gcc/m2/tools-src/makeSystem
@@ -102,8 +102,8 @@ MINIMAL="-fno-scaffold-main -fno-scaffold-dynamic -fno-scaffold-static -fno-m2-p
 
 rm -f ${OUTPUTFILE}
 if ${COMPILER} ${DIALECT} ${LIBRARY} ${MINIMAL} \
-	       -c -fdump-system-exports ${SYSTEMMOD} -o /dev/null 2>&1 > /dev/null ; then
-    types=`${COMPILER} ${DIALECT} ${LIBRARY} ${MINIMAL} -fno-m2-plugin -c -fdump-system-exports ${SYSTEMMOD} -o /dev/null | cut -f5 -d' '`
+	       -S -fdump-system-exports ${SYSTEMMOD} -o /dev/null 2>&1 > /dev/null ; then
+    types=`${COMPILER} ${DIALECT} ${LIBRARY} ${MINIMAL} -fno-m2-plugin -S -fdump-system-exports ${SYSTEMMOD} -o /dev/null | cut -f5 -d' '`
     touch ${OUTPUTFILE}
     displayStart
     displayExportedTypes
@@ -112,6 +112,6 @@ if ${COMPILER} ${DIALECT} ${LIBRARY} ${MINIMAL} \
     displayEnd
 else
     ${COMPILER} ${DIALECT} ${LIBRARY} ${MINIMAL} \
-		-c -fdump-system-exports ${SYSTEMMOD} -o /dev/null
+		-S -fdump-system-exports ${SYSTEMMOD} -o /dev/null
     exit $?
 fi


More information about the Gcc-cvs mailing list