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>

55 files changed, 17 insertions, 17 deletions

diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in
index 122a35c..03677d9 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
index bb92811..bb92811 100644
--- a/gcc/m2/gm2-libs-pim/BitBlockOps.def
+++ b/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
index 863680f..863680f 100644
--- a/gcc/m2/gm2-libs-pim/BitBlockOps.mod
+++ b/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
index e6344c2..e6344c2 100644
--- a/gcc/m2/gm2-libs-pim/BitByteOps.def
+++ b/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
index 318a2e3..318a2e3 100644
--- a/gcc/m2/gm2-libs-pim/BitByteOps.mod
+++ b/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
index 899bb0a..899bb0a 100644
--- a/gcc/m2/gm2-libs-pim/BitWordOps.def
+++ b/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
index 9dd94e7..9dd94e7 100644
--- a/gcc/m2/gm2-libs-pim/BitWordOps.mod
+++ b/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
index 8cd1ebd..8cd1ebd 100644
--- a/gcc/m2/gm2-libs-pim/BlockOps.def
+++ b/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
index eab6938..eab6938 100644
--- a/gcc/m2/gm2-libs-pim/BlockOps.mod
+++ b/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
index ecb33b0..ecb33b0 100644
--- a/gcc/m2/gm2-libs-pim/Break.c
+++ b/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
index 271384c..271384c 100644
--- a/gcc/m2/gm2-libs-pim/Break.def
+++ b/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
index d6b4eec..d6b4eec 100644
--- a/gcc/m2/gm2-libs-pim/CardinalIO.def
+++ b/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
index 5f7e750..5f7e750 100644
--- a/gcc/m2/gm2-libs-pim/CardinalIO.mod
+++ b/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
index d178e05..d178e05 100644
--- a/gcc/m2/gm2-libs-pim/Conversions.def
+++ b/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
index 1c8b893..1c8b893 100644
--- a/gcc/m2/gm2-libs-pim/Conversions.mod
+++ b/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
index 9a3adf6..9a3adf6 100644
--- a/gcc/m2/gm2-libs-pim/DebugPMD.def
+++ b/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
index 12a86ca..12a86ca 100644
--- a/gcc/m2/gm2-libs-pim/DebugPMD.mod
+++ b/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
index 9a00b71..9a00b71 100644
--- a/gcc/m2/gm2-libs-pim/DebugTrace.def
+++ b/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
index 10cf797..10cf797 100644
--- a/gcc/m2/gm2-libs-pim/DebugTrace.mod
+++ b/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
index ccb65e2..ccb65e2 100644
--- a/gcc/m2/gm2-libs-pim/Delay.def
+++ b/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
index e8e0ee1..e8e0ee1 100644
--- a/gcc/m2/gm2-libs-pim/Delay.mod
+++ b/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
index 7c55971..7c55971 100644
--- a/gcc/m2/gm2-libs-pim/Display.def
+++ b/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
index 8006642..8006642 100644
--- a/gcc/m2/gm2-libs-pim/Display.mod
+++ b/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
index 8be1fc2..8be1fc2 100644
--- a/gcc/m2/gm2-libs-pim/ErrorCode.def
+++ b/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
index 37b7945..37b7945 100644
--- a/gcc/m2/gm2-libs-pim/ErrorCode.mod
+++ b/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
index 784c683..784c683 100644
--- a/gcc/m2/gm2-libs-pim/FileSystem.def
+++ b/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
index 9f08819..9f08819 100644
--- a/gcc/m2/gm2-libs-pim/FileSystem.mod
+++ b/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
index f49f8b8..f49f8b8 100644
--- a/gcc/m2/gm2-libs-pim/FloatingUtilities.def
+++ b/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
index 61fc1b3..61fc1b3 100644
--- a/gcc/m2/gm2-libs-pim/FloatingUtilities.mod
+++ b/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
index 2358444..2358444 100644
--- a/gcc/m2/gm2-libs-pim/InOut.def
+++ b/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
index 517aca2..517aca2 100644
--- a/gcc/m2/gm2-libs-pim/InOut.mod
+++ b/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
index e9ebf84..e9ebf84 100644
--- a/gcc/m2/gm2-libs-pim/Keyboard.def
+++ b/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
index 7081c5f..7081c5f 100644
--- a/gcc/m2/gm2-libs-pim/Keyboard.mod
+++ b/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
index ca37245..ca37245 100644
--- a/gcc/m2/gm2-libs-pim/LongIO.def
+++ b/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
index f9f598f..f9f598f 100644
--- a/gcc/m2/gm2-libs-pim/LongIO.mod
+++ b/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
index 4bd0697..4bd0697 100644
--- a/gcc/m2/gm2-libs-pim/NumberConversion.def
+++ b/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
index 634e543..634e543 100644
--- a/gcc/m2/gm2-libs-pim/NumberConversion.mod
+++ b/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
index 4ea3c11..4ea3c11 100644
--- a/gcc/m2/gm2-libs-pim/README.texi
+++ b/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
index bc7fa4b..bc7fa4b 100644
--- a/gcc/m2/gm2-libs-pim/Random.def
+++ b/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
index e50dfbf..e50dfbf 100644
--- a/gcc/m2/gm2-libs-pim/Random.mod
+++ b/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
index 033cd3a..033cd3a 100644
--- a/gcc/m2/gm2-libs-pim/RealConversions.def
+++ b/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
index 189096a..189096a 100644
--- a/gcc/m2/gm2-libs-pim/RealConversions.mod
+++ b/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
index 2c6a04b..2c6a04b 100644
--- a/gcc/m2/gm2-libs-pim/RealInOut.def
+++ b/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
index 855ab9b..855ab9b 100644
--- a/gcc/m2/gm2-libs-pim/RealInOut.mod
+++ b/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
index 5f3f42c..5f3f42c 100644
--- a/gcc/m2/gm2-libs-pim/Strings.def
+++ b/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
index 99dc6c1..99dc6c1 100644
--- a/gcc/m2/gm2-libs-pim/Strings.mod
+++ b/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
index 8adc5d0..8adc5d0 100644
--- a/gcc/m2/gm2-libs-pim/Termbase.def
+++ b/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
index 0b47826..0b47826 100644
--- a/gcc/m2/gm2-libs-pim/Termbase.mod
+++ b/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
index a97e9fb..a97e9fb 100644
--- a/gcc/m2/gm2-libs-pim/Terminal.def
+++ b/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
index cff1b5c..cff1b5c 100644
--- a/gcc/m2/gm2-libs-pim/Terminal.mod
+++ b/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
index d3f3e7d..d3f3e7d 100644
--- a/gcc/m2/gm2-libs-pim/TimeDate.def
+++ b/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
index 74644e8..74644e8 100644
--- a/gcc/m2/gm2-libs-pim/TimeDate.mod
+++ b/gcc/m2/gm2-libs-log/TimeDate.mod
diff --git a/gcc/testsuite/lib/gm2.exp b/gcc/testsuite/lib/gm2.exp
index 15e3729..7f41e19 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 9b28d3e..b7640dd 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 5afee42..3097ea3 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 ; \