diff options
| author | Gaius Mulley <gaiusmod2@gmail.com> | 2023-01-24 22:41:45 +0000 |
|---|---|---|
| committer | Gaius Mulley <gaiusmod2@gmail.com> | 2023-01-24 22:41:45 +0000 |
| commit | f235d695729cc745cf15a00fb8b2cfaded80fd1e (patch) | |
| tree | 1b01e42b4195c3752567d96a75a52e4e056f1cce /libgm2 | |
| parent | 327d45c57ebd2655a7599df0f01b8b5e2f82eda7 (diff) | |
| download | gcc-f235d695729cc745cf15a00fb8b2cfaded80fd1e.zip gcc-f235d695729cc745cf15a00fb8b2cfaded80fd1e.tar.gz gcc-f235d695729cc745cf15a00fb8b2cfaded80fd1e.tar.bz2 | |
Introduce new module to create search paths of dynamic strings.
Introduce a simple DynamicStringPath module to allow the front end
to create and modify a search path from dynamic strings.
gcc/m2/ChangeLog:
* Make-lang.in (GM2-COMP-BOOT-DEFS): Add
DynamicStringPath.def.
(GM2-COMP-BOOT-MODS): Add DynamicStringPath.mod.
(GM2-COMP-DEFS): Add DynamicStringPath.def.
(GM2-COMP-MODS): Add DynamicStringPath.mod.
($(objdir)/m2/gm2-libs-min/SYSTEM.def): Split path into
multiple -I components.
($(objdir)/m2/gm2-libs/SYSTEM.def): Ditto.
($(objdir)/m2/gm2-libs-coroutines/SYSTEM.def): Ditto.
* gm2-compiler/M2Options.mod: Import DynamicStringPath.
(SetSearchPath): Reimplement using DynamicStringPath
procedures.
* gm2-compiler/M2Search.def (InitSearchPath): Remove.
(PrependSearchPath): Remove.
* gm2-compiler/M2Search.mod (SFIO): Remove import.
(DynamicStringPath): Add import.
(Directory): Remove.
(UserPath): Remove.
(InitialPath): Remove.
(InitSearchPath): Remove.
(PrependSearchPath): Remove.
(FindSourceFile): Re-implement.
(FindSourceDefFile): Re-implement.
(FindSourceModFile): Re-implement.
* gm2-gcc/init.cc (_M2_DynamicStringPath_init):
New prototype.
(init_FrontEndInit): Call _M2_DynamicStringPath_init.
* tools-src/makeSystem: Allow multiple -I paths.
* gm2-compiler/DynamicStringPath.def: New file.
* gm2-compiler/DynamicStringPath.mod: New file.
* gm2-gcc/m2options.h (M2Options_SetMakeIncludePath): Add
prototype.
Co-Authored by: Iain Sandoe <iain@sandoe.co.uk>
libgm2/ChangeLog:
* libm2cor/Makefile.am (SYSTEM.def): Split path into
multiple -I components.
* libm2cor/Makefile.in: Rebuild.
* libm2min/Makefile.am (SYSTEM.def): Split path into
multiple -I components.
* libm2min/Makefile.in: Rebuild.
* libm2iso/Makefile.am (SYSTEM.def): Split path into
multiple -I components.
* libm2iso/Makefile.in: Rebuild.
Co-Authored by: Iain Sandoe <iain@sandoe.co.uk>
Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
Diffstat (limited to 'libgm2')
| -rw-r--r-- | libgm2/libm2cor/Makefile.am | 2 | ||||
| -rw-r--r-- | libgm2/libm2cor/Makefile.in | 2 | ||||
| -rw-r--r-- | libgm2/libm2iso/Makefile.am | 2 | ||||
| -rw-r--r-- | libgm2/libm2iso/Makefile.in | 2 | ||||
| -rw-r--r-- | libgm2/libm2min/Makefile.am | 2 | ||||
| -rw-r--r-- | libgm2/libm2min/Makefile.in | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am index 2cc3084..e7c7273 100644 --- a/libgm2/libm2cor/Makefile.am +++ b/libgm2/libm2cor/Makefile.am @@ -129,7 +129,7 @@ SYSTEM.def: Makefile bash $(GM2_SRC)/tools-src/makeSystem -fpim \ $(GM2_SRC)/gm2-libs-coroutines/SYSTEM.def \ $(GM2_SRC)/gm2-libs-coroutines/SYSTEM.mod \ - -I$(GM2_SRC)/gm2-libs-coroutines:$(GM2_SRC)/gm2-libs:$(GM2_SRC)/gm2-libs-iso \ + -I$(GM2_SRC)/gm2-libs-coroutines -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso \ "$(GM2_FOR_TARGET)" $@ .mod.lo: diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in index 8806d7b..677aebf 100644 --- a/libgm2/libm2cor/Makefile.in +++ b/libgm2/libm2cor/Makefile.in @@ -795,7 +795,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_CORLIB_TRUE@ bash $(GM2_SRC)/tools-src/makeSystem -fpim \ @BUILD_CORLIB_TRUE@ $(GM2_SRC)/gm2-libs-coroutines/SYSTEM.def \ @BUILD_CORLIB_TRUE@ $(GM2_SRC)/gm2-libs-coroutines/SYSTEM.mod \ -@BUILD_CORLIB_TRUE@ -I$(GM2_SRC)/gm2-libs-coroutines:$(GM2_SRC)/gm2-libs:$(GM2_SRC)/gm2-libs-iso \ +@BUILD_CORLIB_TRUE@ -I$(GM2_SRC)/gm2-libs-coroutines -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso \ @BUILD_CORLIB_TRUE@ "$(GM2_FOR_TARGET)" $@ @BUILD_CORLIB_TRUE@.mod.lo: diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am index a28cd5a..af3728b 100644 --- a/libgm2/libm2iso/Makefile.am +++ b/libgm2/libm2iso/Makefile.am @@ -204,7 +204,7 @@ SYSTEM.def: Makefile bash $(GM2_SRC)/tools-src/makeSystem -fiso \ $(GM2_SRC)/gm2-libs-iso/SYSTEM.def \ $(GM2_SRC)/gm2-libs-iso/SYSTEM.mod \ - -I$(GM2_SRC)/gm2-libs-iso:$(GM2_SRC)/gm2-libs \ + -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs \ "$(GM2_FOR_TARGET)" $@ ## add these to the .mod.o rule when optimization is fixed $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index 0ca852a..b327cbc 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -905,7 +905,7 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_ISOLIB_TRUE@ bash $(GM2_SRC)/tools-src/makeSystem -fiso \ @BUILD_ISOLIB_TRUE@ $(GM2_SRC)/gm2-libs-iso/SYSTEM.def \ @BUILD_ISOLIB_TRUE@ $(GM2_SRC)/gm2-libs-iso/SYSTEM.mod \ -@BUILD_ISOLIB_TRUE@ -I$(GM2_SRC)/gm2-libs-iso:$(GM2_SRC)/gm2-libs \ +@BUILD_ISOLIB_TRUE@ -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs \ @BUILD_ISOLIB_TRUE@ "$(GM2_FOR_TARGET)" $@ @BUILD_ISOLIB_TRUE@.mod.lo: diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am index bbbf3d4..f63f243 100644 --- a/libgm2/libm2min/Makefile.am +++ b/libgm2/libm2min/Makefile.am @@ -128,7 +128,7 @@ SYSTEM.def: Makefile bash $(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:$(GM2_SRC)/gm2-libs \ + -I$(GM2_SRC)/gm2-libs-min -I$(GM2_SRC)/gm2-libs \ "$(GM2_FOR_TARGET) -fno-exceptions" $@ install-data-local: force diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in index ad818bc..7e4496c 100644 --- a/libgm2/libm2min/Makefile.in +++ b/libgm2/libm2min/Makefile.in @@ -754,7 +754,7 @@ SYSTEM.def: Makefile bash $(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:$(GM2_SRC)/gm2-libs \ + -I$(GM2_SRC)/gm2-libs-min -I$(GM2_SRC)/gm2-libs \ "$(GM2_FOR_TARGET) -fno-exceptions" $@ install-data-local: force |