[gcc r13-5531] Modula-2 rename logitech libraries to log
Gaius Mulley
gaius@gcc.gnu.org
Tue Jan 31 12:38:03 GMT 2023
https://gcc.gnu.org/g:9e56306f4d7c15e7667d8ac0b62ae6efb93ba756
commit r13-5531-g9e56306f4d7c15e7667d8ac0b62ae6efb93ba756
Author: Gaius Mulley <gaiusmod2@gmail.com>
Date: Tue Jan 31 12:37:36 2023 +0000
Modula-2 rename logitech libraries to log
Rename the gcc/m2/gm2-libs-pim to gcc/m2/gm2-libs-log for
consistency.
gcc/m2/ChangeLog:
* Make-lang.in (gm2-libs.texi-check): Rename
m2/gm2-libs-pim to m2/gm2-libs-log.
* gm2-libs-pim/BitBlockOps.def: Moved to...
* gm2-libs-log/BitBlockOps.def: ...here.
* gm2-libs-pim/BitBlockOps.mod: Moved to...
* gm2-libs-log/BitBlockOps.mod: ...here.
* gm2-libs-pim/BitByteOps.def: Moved to...
* gm2-libs-log/BitByteOps.def: ...here.
* gm2-libs-pim/BitByteOps.mod: Moved to...
* gm2-libs-log/BitByteOps.mod: ...here.
* gm2-libs-pim/BitWordOps.def: Moved to...
* gm2-libs-log/BitWordOps.def: ...here.
* gm2-libs-pim/BitWordOps.mod: Moved to...
* gm2-libs-log/BitWordOps.mod: ...here.
* gm2-libs-pim/BlockOps.def: Moved to...
* gm2-libs-log/BlockOps.def: ...here.
* gm2-libs-pim/BlockOps.mod: Moved to...
* gm2-libs-log/BlockOps.mod: ...here.
* gm2-libs-pim/Break.c: Moved to...
* gm2-libs-log/Break.c: ...here.
* gm2-libs-pim/Break.def: Moved to...
* gm2-libs-log/Break.def: ...here.
* gm2-libs-pim/CardinalIO.def: Moved to...
* gm2-libs-log/CardinalIO.def: ...here.
* gm2-libs-pim/CardinalIO.mod: Moved to...
* gm2-libs-log/CardinalIO.mod: ...here.
* gm2-libs-pim/Conversions.def: Moved to...
* gm2-libs-log/Conversions.def: ...here.
* gm2-libs-pim/Conversions.mod: Moved to...
* gm2-libs-log/Conversions.mod: ...here.
* gm2-libs-pim/DebugPMD.def: Moved to...
* gm2-libs-log/DebugPMD.def: ...here.
* gm2-libs-pim/DebugPMD.mod: Moved to...
* gm2-libs-log/DebugPMD.mod: ...here.
* gm2-libs-pim/DebugTrace.def: Moved to...
* gm2-libs-log/DebugTrace.def: ...here.
* gm2-libs-pim/DebugTrace.mod: Moved to...
* gm2-libs-log/DebugTrace.mod: ...here.
* gm2-libs-pim/Delay.def: Moved to...
* gm2-libs-log/Delay.def: ...here.
* gm2-libs-pim/Delay.mod: Moved to...
* gm2-libs-log/Delay.mod: ...here.
* gm2-libs-pim/Display.def: Moved to...
* gm2-libs-log/Display.def: ...here.
* gm2-libs-pim/Display.mod: Moved to...
* gm2-libs-log/Display.mod: ...here.
* gm2-libs-pim/ErrorCode.def: Moved to...
* gm2-libs-log/ErrorCode.def: ...here.
* gm2-libs-pim/ErrorCode.mod: Moved to...
* gm2-libs-log/ErrorCode.mod: ...here.
* gm2-libs-pim/FileSystem.def: Moved to...
* gm2-libs-log/FileSystem.def: ...here.
* gm2-libs-pim/FileSystem.mod: Moved to...
* gm2-libs-log/FileSystem.mod: ...here.
* gm2-libs-pim/FloatingUtilities.def: Moved to...
* gm2-libs-log/FloatingUtilities.def: ...here.
* gm2-libs-pim/FloatingUtilities.mod: Moved to...
* gm2-libs-log/FloatingUtilities.mod: ...here.
* gm2-libs-pim/InOut.def: Moved to...
* gm2-libs-log/InOut.def: ...here.
* gm2-libs-pim/InOut.mod: Moved to...
* gm2-libs-log/InOut.mod: ...here.
* gm2-libs-pim/Keyboard.def: Moved to...
* gm2-libs-log/Keyboard.def: ...here.
* gm2-libs-pim/Keyboard.mod: Moved to...
* gm2-libs-log/Keyboard.mod: ...here.
* gm2-libs-pim/LongIO.def: Moved to...
* gm2-libs-log/LongIO.def: ...here.
* gm2-libs-pim/LongIO.mod: Moved to...
* gm2-libs-log/LongIO.mod: ...here.
* gm2-libs-pim/NumberConversion.def: Moved to...
* gm2-libs-log/NumberConversion.def: ...here.
* gm2-libs-pim/NumberConversion.mod: Moved to...
* gm2-libs-log/NumberConversion.mod: ...here.
* gm2-libs-pim/README.texi: Moved to...
* gm2-libs-log/README.texi: ...here.
* gm2-libs-pim/Random.def: Moved to...
* gm2-libs-log/Random.def: ...here.
* gm2-libs-pim/Random.mod: Moved to...
* gm2-libs-log/Random.mod: ...here.
* gm2-libs-pim/RealConversions.def: Moved to...
* gm2-libs-log/RealConversions.def: ...here.
* gm2-libs-pim/RealConversions.mod: Moved to...
* gm2-libs-log/RealConversions.mod: ...here.
* gm2-libs-pim/RealInOut.def: Moved to...
* gm2-libs-log/RealInOut.def: ...here.
* gm2-libs-pim/RealInOut.mod: Moved to...
* gm2-libs-log/RealInOut.mod: ...here.
* gm2-libs-pim/Strings.def: Moved to...
* gm2-libs-log/Strings.def: ...here.
* gm2-libs-pim/Strings.mod: Moved to...
* gm2-libs-log/Strings.mod: ...here.
* gm2-libs-pim/Termbase.def: Moved to...
* gm2-libs-log/Termbase.def: ...here.
* gm2-libs-pim/Termbase.mod: Moved to...
* gm2-libs-log/Termbase.mod: ...here.
* gm2-libs-pim/Terminal.def: Moved to...
* gm2-libs-log/Terminal.def: ...here.
* gm2-libs-pim/Terminal.mod: Moved to...
* gm2-libs-log/Terminal.mod: ...here.
* gm2-libs-pim/TimeDate.def: Moved to...
* gm2-libs-log/TimeDate.def: ...here.
* gm2-libs-pim/TimeDate.mod: Moved to...
* gm2-libs-log/TimeDate.mod: ...here.
libgm2/ChangeLog:
* libm2log/Makefile.am (VPATH): Replace gm2-libs-pim
with gm2-libs-log.
(libm2log_la_M2FLAGS): Replace gm2-libs-pim with
gm2-libs-log.
(install-data-local): Replace gm2-libs-pim with
gm2-libs-log.
* libm2log/Makefile.in: Rebuilt.
gcc/testsuite/ChangeLog:
* lib/gm2.exp (gm2_init_pimx): Replace gm2-libs-pim with
gm2-libs-log.
(gm2_init_iso): Replace gm2-libs-pim with gm2-libs-log.
(gm2_init_ulm): Replace gm2-libs-pim with gm2-libs-log.
(gm2_init_log): Replace gm2-libs-pim with gm2-libs-log.
(gm2_init_cor): Replace gm2-libs-pim with gm2-libs-log.
Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
Diff:
---
gcc/m2/Make-lang.in | 2 +-
gcc/m2/{gm2-libs-pim => gm2-libs-log}/BitBlockOps.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/BitBlockOps.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/BitByteOps.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/BitByteOps.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/BitWordOps.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/BitWordOps.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/BlockOps.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/BlockOps.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Break.c | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Break.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/CardinalIO.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/CardinalIO.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Conversions.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Conversions.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/DebugPMD.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/DebugPMD.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/DebugTrace.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/DebugTrace.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Delay.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Delay.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Display.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Display.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/ErrorCode.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/ErrorCode.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/FileSystem.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/FileSystem.mod | 0
.../{gm2-libs-pim => gm2-libs-log}/FloatingUtilities.def | 0
.../{gm2-libs-pim => gm2-libs-log}/FloatingUtilities.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/InOut.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/InOut.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Keyboard.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Keyboard.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/LongIO.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/LongIO.mod | 0
.../{gm2-libs-pim => gm2-libs-log}/NumberConversion.def | 0
.../{gm2-libs-pim => gm2-libs-log}/NumberConversion.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/README.texi | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Random.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Random.mod | 0
.../{gm2-libs-pim => gm2-libs-log}/RealConversions.def | 0
.../{gm2-libs-pim => gm2-libs-log}/RealConversions.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/RealInOut.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/RealInOut.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Strings.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Strings.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Termbase.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Termbase.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Terminal.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/Terminal.mod | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/TimeDate.def | 0
gcc/m2/{gm2-libs-pim => gm2-libs-log}/TimeDate.mod | 0
gcc/testsuite/lib/gm2.exp | 16 ++++++++--------
libgm2/libm2log/Makefile.am | 8 ++++----
libgm2/libm2log/Makefile.in | 8 ++++----
55 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index 122a35c7902..03677d9e5ea 100644
--- a/gcc/m2/Make-lang.in
+++ b/gcc/m2/Make-lang.in
@@ -176,7 +176,7 @@ m2/gm2-libs.texi: gm2-libs.texi-check; @true
ifeq ($(HAVE_PYTHON),yes)
gm2-libs.texi-check: m2/SYSTEM-pim.texi m2/SYSTEM-iso.texi m2/Builtins.texi \
$(objdir)/m2/gm2-libs-coroutines/SYSTEM.def
- test -d m2/gm2-libs-pim || $(mkinstalldirs) m2/gm2-libs-pim
+ test -d m2/gm2-libs-log || $(mkinstalldirs) m2/gm2-libs-log
test -d m2/gm2-libs-iso || $(mkinstalldirs) m2/gm2-libs-iso
test -d m2/gm2-libs || $(mkinstalldirs) m2/gm2-libs
$(PYTHON) $(srcdir)/m2/tools-src/def2doc.py -t -uLibraries -s$(srcdir)/m2 -b$(objdir)/m2 -o $(objdir)/m2/gm2-libs.texi
diff --git a/gcc/m2/gm2-libs-pim/BitBlockOps.def b/gcc/m2/gm2-libs-log/BitBlockOps.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/BitBlockOps.def
rename to gcc/m2/gm2-libs-log/BitBlockOps.def
diff --git a/gcc/m2/gm2-libs-pim/BitBlockOps.mod b/gcc/m2/gm2-libs-log/BitBlockOps.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/BitBlockOps.mod
rename to gcc/m2/gm2-libs-log/BitBlockOps.mod
diff --git a/gcc/m2/gm2-libs-pim/BitByteOps.def b/gcc/m2/gm2-libs-log/BitByteOps.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/BitByteOps.def
rename to gcc/m2/gm2-libs-log/BitByteOps.def
diff --git a/gcc/m2/gm2-libs-pim/BitByteOps.mod b/gcc/m2/gm2-libs-log/BitByteOps.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/BitByteOps.mod
rename to gcc/m2/gm2-libs-log/BitByteOps.mod
diff --git a/gcc/m2/gm2-libs-pim/BitWordOps.def b/gcc/m2/gm2-libs-log/BitWordOps.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/BitWordOps.def
rename to gcc/m2/gm2-libs-log/BitWordOps.def
diff --git a/gcc/m2/gm2-libs-pim/BitWordOps.mod b/gcc/m2/gm2-libs-log/BitWordOps.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/BitWordOps.mod
rename to gcc/m2/gm2-libs-log/BitWordOps.mod
diff --git a/gcc/m2/gm2-libs-pim/BlockOps.def b/gcc/m2/gm2-libs-log/BlockOps.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/BlockOps.def
rename to gcc/m2/gm2-libs-log/BlockOps.def
diff --git a/gcc/m2/gm2-libs-pim/BlockOps.mod b/gcc/m2/gm2-libs-log/BlockOps.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/BlockOps.mod
rename to gcc/m2/gm2-libs-log/BlockOps.mod
diff --git a/gcc/m2/gm2-libs-pim/Break.c b/gcc/m2/gm2-libs-log/Break.c
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Break.c
rename to gcc/m2/gm2-libs-log/Break.c
diff --git a/gcc/m2/gm2-libs-pim/Break.def b/gcc/m2/gm2-libs-log/Break.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Break.def
rename to gcc/m2/gm2-libs-log/Break.def
diff --git a/gcc/m2/gm2-libs-pim/CardinalIO.def b/gcc/m2/gm2-libs-log/CardinalIO.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/CardinalIO.def
rename to gcc/m2/gm2-libs-log/CardinalIO.def
diff --git a/gcc/m2/gm2-libs-pim/CardinalIO.mod b/gcc/m2/gm2-libs-log/CardinalIO.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/CardinalIO.mod
rename to gcc/m2/gm2-libs-log/CardinalIO.mod
diff --git a/gcc/m2/gm2-libs-pim/Conversions.def b/gcc/m2/gm2-libs-log/Conversions.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Conversions.def
rename to gcc/m2/gm2-libs-log/Conversions.def
diff --git a/gcc/m2/gm2-libs-pim/Conversions.mod b/gcc/m2/gm2-libs-log/Conversions.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Conversions.mod
rename to gcc/m2/gm2-libs-log/Conversions.mod
diff --git a/gcc/m2/gm2-libs-pim/DebugPMD.def b/gcc/m2/gm2-libs-log/DebugPMD.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/DebugPMD.def
rename to gcc/m2/gm2-libs-log/DebugPMD.def
diff --git a/gcc/m2/gm2-libs-pim/DebugPMD.mod b/gcc/m2/gm2-libs-log/DebugPMD.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/DebugPMD.mod
rename to gcc/m2/gm2-libs-log/DebugPMD.mod
diff --git a/gcc/m2/gm2-libs-pim/DebugTrace.def b/gcc/m2/gm2-libs-log/DebugTrace.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/DebugTrace.def
rename to gcc/m2/gm2-libs-log/DebugTrace.def
diff --git a/gcc/m2/gm2-libs-pim/DebugTrace.mod b/gcc/m2/gm2-libs-log/DebugTrace.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/DebugTrace.mod
rename to gcc/m2/gm2-libs-log/DebugTrace.mod
diff --git a/gcc/m2/gm2-libs-pim/Delay.def b/gcc/m2/gm2-libs-log/Delay.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Delay.def
rename to gcc/m2/gm2-libs-log/Delay.def
diff --git a/gcc/m2/gm2-libs-pim/Delay.mod b/gcc/m2/gm2-libs-log/Delay.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Delay.mod
rename to gcc/m2/gm2-libs-log/Delay.mod
diff --git a/gcc/m2/gm2-libs-pim/Display.def b/gcc/m2/gm2-libs-log/Display.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Display.def
rename to gcc/m2/gm2-libs-log/Display.def
diff --git a/gcc/m2/gm2-libs-pim/Display.mod b/gcc/m2/gm2-libs-log/Display.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Display.mod
rename to gcc/m2/gm2-libs-log/Display.mod
diff --git a/gcc/m2/gm2-libs-pim/ErrorCode.def b/gcc/m2/gm2-libs-log/ErrorCode.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/ErrorCode.def
rename to gcc/m2/gm2-libs-log/ErrorCode.def
diff --git a/gcc/m2/gm2-libs-pim/ErrorCode.mod b/gcc/m2/gm2-libs-log/ErrorCode.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/ErrorCode.mod
rename to gcc/m2/gm2-libs-log/ErrorCode.mod
diff --git a/gcc/m2/gm2-libs-pim/FileSystem.def b/gcc/m2/gm2-libs-log/FileSystem.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/FileSystem.def
rename to gcc/m2/gm2-libs-log/FileSystem.def
diff --git a/gcc/m2/gm2-libs-pim/FileSystem.mod b/gcc/m2/gm2-libs-log/FileSystem.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/FileSystem.mod
rename to gcc/m2/gm2-libs-log/FileSystem.mod
diff --git a/gcc/m2/gm2-libs-pim/FloatingUtilities.def b/gcc/m2/gm2-libs-log/FloatingUtilities.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/FloatingUtilities.def
rename to gcc/m2/gm2-libs-log/FloatingUtilities.def
diff --git a/gcc/m2/gm2-libs-pim/FloatingUtilities.mod b/gcc/m2/gm2-libs-log/FloatingUtilities.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/FloatingUtilities.mod
rename to gcc/m2/gm2-libs-log/FloatingUtilities.mod
diff --git a/gcc/m2/gm2-libs-pim/InOut.def b/gcc/m2/gm2-libs-log/InOut.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/InOut.def
rename to gcc/m2/gm2-libs-log/InOut.def
diff --git a/gcc/m2/gm2-libs-pim/InOut.mod b/gcc/m2/gm2-libs-log/InOut.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/InOut.mod
rename to gcc/m2/gm2-libs-log/InOut.mod
diff --git a/gcc/m2/gm2-libs-pim/Keyboard.def b/gcc/m2/gm2-libs-log/Keyboard.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Keyboard.def
rename to gcc/m2/gm2-libs-log/Keyboard.def
diff --git a/gcc/m2/gm2-libs-pim/Keyboard.mod b/gcc/m2/gm2-libs-log/Keyboard.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Keyboard.mod
rename to gcc/m2/gm2-libs-log/Keyboard.mod
diff --git a/gcc/m2/gm2-libs-pim/LongIO.def b/gcc/m2/gm2-libs-log/LongIO.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/LongIO.def
rename to gcc/m2/gm2-libs-log/LongIO.def
diff --git a/gcc/m2/gm2-libs-pim/LongIO.mod b/gcc/m2/gm2-libs-log/LongIO.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/LongIO.mod
rename to gcc/m2/gm2-libs-log/LongIO.mod
diff --git a/gcc/m2/gm2-libs-pim/NumberConversion.def b/gcc/m2/gm2-libs-log/NumberConversion.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/NumberConversion.def
rename to gcc/m2/gm2-libs-log/NumberConversion.def
diff --git a/gcc/m2/gm2-libs-pim/NumberConversion.mod b/gcc/m2/gm2-libs-log/NumberConversion.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/NumberConversion.mod
rename to gcc/m2/gm2-libs-log/NumberConversion.mod
diff --git a/gcc/m2/gm2-libs-pim/README.texi b/gcc/m2/gm2-libs-log/README.texi
similarity index 100%
rename from gcc/m2/gm2-libs-pim/README.texi
rename to gcc/m2/gm2-libs-log/README.texi
diff --git a/gcc/m2/gm2-libs-pim/Random.def b/gcc/m2/gm2-libs-log/Random.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Random.def
rename to gcc/m2/gm2-libs-log/Random.def
diff --git a/gcc/m2/gm2-libs-pim/Random.mod b/gcc/m2/gm2-libs-log/Random.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Random.mod
rename to gcc/m2/gm2-libs-log/Random.mod
diff --git a/gcc/m2/gm2-libs-pim/RealConversions.def b/gcc/m2/gm2-libs-log/RealConversions.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/RealConversions.def
rename to gcc/m2/gm2-libs-log/RealConversions.def
diff --git a/gcc/m2/gm2-libs-pim/RealConversions.mod b/gcc/m2/gm2-libs-log/RealConversions.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/RealConversions.mod
rename to gcc/m2/gm2-libs-log/RealConversions.mod
diff --git a/gcc/m2/gm2-libs-pim/RealInOut.def b/gcc/m2/gm2-libs-log/RealInOut.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/RealInOut.def
rename to gcc/m2/gm2-libs-log/RealInOut.def
diff --git a/gcc/m2/gm2-libs-pim/RealInOut.mod b/gcc/m2/gm2-libs-log/RealInOut.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/RealInOut.mod
rename to gcc/m2/gm2-libs-log/RealInOut.mod
diff --git a/gcc/m2/gm2-libs-pim/Strings.def b/gcc/m2/gm2-libs-log/Strings.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Strings.def
rename to gcc/m2/gm2-libs-log/Strings.def
diff --git a/gcc/m2/gm2-libs-pim/Strings.mod b/gcc/m2/gm2-libs-log/Strings.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Strings.mod
rename to gcc/m2/gm2-libs-log/Strings.mod
diff --git a/gcc/m2/gm2-libs-pim/Termbase.def b/gcc/m2/gm2-libs-log/Termbase.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Termbase.def
rename to gcc/m2/gm2-libs-log/Termbase.def
diff --git a/gcc/m2/gm2-libs-pim/Termbase.mod b/gcc/m2/gm2-libs-log/Termbase.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Termbase.mod
rename to gcc/m2/gm2-libs-log/Termbase.mod
diff --git a/gcc/m2/gm2-libs-pim/Terminal.def b/gcc/m2/gm2-libs-log/Terminal.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Terminal.def
rename to gcc/m2/gm2-libs-log/Terminal.def
diff --git a/gcc/m2/gm2-libs-pim/Terminal.mod b/gcc/m2/gm2-libs-log/Terminal.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/Terminal.mod
rename to gcc/m2/gm2-libs-log/Terminal.mod
diff --git a/gcc/m2/gm2-libs-pim/TimeDate.def b/gcc/m2/gm2-libs-log/TimeDate.def
similarity index 100%
rename from gcc/m2/gm2-libs-pim/TimeDate.def
rename to gcc/m2/gm2-libs-log/TimeDate.def
diff --git a/gcc/m2/gm2-libs-pim/TimeDate.mod b/gcc/m2/gm2-libs-log/TimeDate.mod
similarity index 100%
rename from gcc/m2/gm2-libs-pim/TimeDate.mod
rename to gcc/m2/gm2-libs-log/TimeDate.mod
diff --git a/gcc/testsuite/lib/gm2.exp b/gcc/testsuite/lib/gm2.exp
index 15e3729e5a3..7f41e19c89e 100644
--- a/gcc/testsuite/lib/gm2.exp
+++ b/gcc/testsuite/lib/gm2.exp
@@ -334,18 +334,18 @@ proc gm2_init_pimx { dialect paths args } {
global gccpath
set gm2src ${srcdir}/../m2
-
+
send_log "srcdir is $srcdir\n"
send_log "gccpath is $gccpath\n"
send_log "gm2src is $gm2src\n"
set theIpath -I${gccpath}/libgm2/libm2pim
- lappend theIpath -I${gm2src}/gm2-libs-pim
+ lappend theIpath -I${gm2src}/gm2-libs-log
# NOTE:
lappend theIpath -I${gm2src}/gm2-libs
-
+
set theLpath -L${gccpath}/libgm2/libm2pim/.libs
lappend theIpath -I${gccpath}/libgm2/libm2iso
@@ -418,7 +418,7 @@ proc gm2_init_iso { paths args } {
set theLpath -L${gccpath}/libgm2/libm2iso/.libs
lappend theIpath -I${gccpath}/libgm2/libm2pim
- lappend theIpath -I${gm2src}/gm2-libs-pim
+ lappend theIpath -I${gm2src}/gm2-libs-log
# NOTE:
lappend theIpath -I${gm2src}/gm2-libs
@@ -456,7 +456,7 @@ proc gm2_init_ulm { paths args } {
set theLpath -L${gccpath}/libgm2/libm2ulm/.libs
lappend theIpath -I${gccpath}/libgm2/libm2pim
- lappend theIpath -I${gm2src}/gm2-libs-pim
+ lappend theIpath -I${gm2src}/gm2-libs-log
# NOTE:
lappend theIpath -I${gm2src}/gm2-libs
@@ -490,8 +490,8 @@ proc gm2_init_log { paths args } {
# FIXME: this seems to interleave the library defs.
set theIpath -I${gccpath}/libgm2/libm2log
- lappend theIpath -I${gm2src}/gm2-libs-pim
-
+ lappend theIpath -I${gm2src}/gm2-libs-log
+
set theLpath -L${gccpath}/libgm2/libm2log/.libs
lappend theIpath -I${gccpath}/libgm2/libm2pim
@@ -536,7 +536,7 @@ proc gm2_init_cor { paths args } {
set theLpath -L${gccpath}/libgm2/libm2cor/.libs
lappend theIpath -I${gccpath}/libgm2/libm2pim
- lappend theIpath -I${gm2src}/gm2-libs-pim
+ lappend theIpath -I${gm2src}/gm2-libs-log
lappend theLpath -L${gccpath}/libgm2/libm2pim/.libs
diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am
index 9b28d3e3d5b..b7640ddd96c 100644
--- a/libgm2/libm2log/Makefile.am
+++ b/libgm2/libm2log/Makefile.am
@@ -19,7 +19,7 @@ SUFFIXES = .c .mod .def .o .obj .lo .a .la
ACLOCAL_AMFLAGS = -I . -I .. -I ../config
-VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-pim
+VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-log
# Multilib support.
MAKEOVERRIDES=
@@ -131,7 +131,7 @@ libm2log_la_SOURCES = $(M2MODS) Break.c
libm2log_la_DEPENDENCIES = ../libm2pim/SYSTEM.def $(addsuffix .lo, $(basename $(libm2log_la_SOURCES)))
libm2log_la_CFLAGS = -I. -DBUILD_GM2_LIBS -I@srcdir@/../
-libm2log_la_M2FLAGS = -I../libm2pim -I$(GM2_SRC)/gm2-libs-pim -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso
+libm2log_la_M2FLAGS = -I../libm2pim -I$(GM2_SRC)/gm2-libs-log -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso
if TARGET_DARWIN
libm2log_la_link_flags = -Wl,-undefined,dynamic_lookup
else
@@ -158,8 +158,8 @@ install-data-local: force
for i in $(M2DEFS) $(M2MODS) ; do \
if [ -f $$i ] ; then \
$(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
- elif [ -f @srcdir@/../../gcc/m2/gm2-libs-pim/$$i ] ; then \
- $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-pim/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
+ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-log/$$i ] ; then \
+ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-log/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
else \
echo "cannot find $$i" ; exit 1 ; \
fi ; \
diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in
index 5afee42c31b..3097ea38124 100644
--- a/libgm2/libm2log/Makefile.in
+++ b/libgm2/libm2log/Makefile.in
@@ -229,7 +229,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-pim
+VPATH = . @srcdir@ @srcdir@/../../gcc/m2/gm2-libs-log
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -471,7 +471,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
@BUILD_LOGLIB_TRUE@libm2log_la_SOURCES = $(M2MODS) Break.c
@BUILD_LOGLIB_TRUE@libm2log_la_DEPENDENCIES = ../libm2pim/SYSTEM.def $(addsuffix .lo, $(basename $(libm2log_la_SOURCES)))
@BUILD_LOGLIB_TRUE@libm2log_la_CFLAGS = -I. -DBUILD_GM2_LIBS -I@srcdir@/../
-@BUILD_LOGLIB_TRUE@libm2log_la_M2FLAGS = -I../libm2pim -I$(GM2_SRC)/gm2-libs-pim -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso
+@BUILD_LOGLIB_TRUE@libm2log_la_M2FLAGS = -I../libm2pim -I$(GM2_SRC)/gm2-libs-log -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso
@BUILD_LOGLIB_TRUE@@TARGET_DARWIN_FALSE@libm2log_la_link_flags =
@BUILD_LOGLIB_TRUE@@TARGET_DARWIN_TRUE@libm2log_la_link_flags = -Wl,-undefined,dynamic_lookup
@BUILD_LOGLIB_TRUE@libm2log_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2log_la_link_flags)
@@ -791,8 +791,8 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
@BUILD_LOGLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \
@BUILD_LOGLIB_TRUE@ if [ -f $$i ] ; then \
@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
-@BUILD_LOGLIB_TRUE@ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-pim/$$i ] ; then \
-@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-pim/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
+@BUILD_LOGLIB_TRUE@ elif [ -f @srcdir@/../../gcc/m2/gm2-libs-log/$$i ] ; then \
+@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs-log/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \
@BUILD_LOGLIB_TRUE@ else \
@BUILD_LOGLIB_TRUE@ echo "cannot find $$i" ; exit 1 ; \
@BUILD_LOGLIB_TRUE@ fi ; \
More information about the Gcc-cvs
mailing list