From 88885db96422a18fc83ae41ad7690915b2072be0 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Tue, 3 Sep 1991 10:54:20 +0000
Subject: [PATCH] New installation mechanism

---
 mach/m68k2/.distr        |  7 ++-----
 mach/m68k2/Action        | 29 ++++++++++-------------------
 mach/m68k2/Unisoft_bug   |  3 ---
 mach/m68k2/libfp/.distr  |  1 -
 mach/m68k2/libsys/.distr |  2 --
 mach/m68k2/mach_params   |  4 ++++
 mach/m68k2/top/.distr    |  1 -
 mach/m68k4/.distr        |  9 +++------
 mach/m68k4/Action        | 22 +++++-----------------
 mach/m68k4/libem/.distr  |  7 -------
 mach/m68k4/libem/dia.s   |  2 +-
 mach/m68k4/libem/shp.s   |  2 +-
 mach/m68k4/libem/trp.s   |  1 -
 mach/m68k4/mach_params   |  4 ++++
 mach/mantra/.distr       |  3 ---
 mach/mantra/mach_params  |  4 ++++
 16 files changed, 34 insertions(+), 67 deletions(-)
 create mode 100644 mach/m68k2/mach_params
 create mode 100644 mach/m68k4/mach_params
 create mode 100644 mach/mantra/mach_params

diff --git a/mach/m68k2/.distr b/mach/m68k2/.distr
index 280ad8417..7d818f74d 100644
--- a/mach/m68k2/.distr
+++ b/mach/m68k2/.distr
@@ -5,12 +5,9 @@ as
 ncg
 cv
 dl
-libcc
 libem
-libpc
+libend
 libsys
-libbc
 top
-liboc
 libfp
-libm2
+mach_params
diff --git a/mach/m68k2/Action b/mach/m68k2/Action
index 00478dc9b..53f333166 100644
--- a/mach/m68k2/Action
+++ b/mach/m68k2/Action
@@ -4,33 +4,24 @@ end
 name "Motorola 68000 2-4 backend"
 dir ncg
 end
-name "Motorola 68000 2-4 conversion program"
-dir cv
-end
 name "Motorola 68000 target optimizer"
 dir top
 end
-name "Motorola 68000 2-4 C libraries"
-dir libcc
+name "Motorola 68000 2-4 conversion program"
+dir cv
 end
 name "Motorola 68000 2-4 EM library"
 dir libem
 end
-name "Motorola 68000 2-4 Pascal library"
-dir libpc
-end
-name "Motorola 68000 2-4 System library"
-dir libsys
-end
-name "Motorola 68000 2-4 Basic library"
-dir libbc
-end
-name "Motorola 68000 2-4 Occam library"
-dir liboc
-end
-name "Motorola 68000 2-4 Modula-2 library"
-dir libm2
+name "Motorola 68000 2-4 etext,edata,end library"
+dir libend
 end
 name "Motorola 68000 2-4 floating point library"
 dir libfp
 end
+name "Motorola 68000 2-4 System library"
+dir libsys
+end
+name "Motorola 68000 2-4 conversion program"
+dir cv
+end
diff --git a/mach/m68k2/Unisoft_bug b/mach/m68k2/Unisoft_bug
index af4631409..bb217603f 100644
--- a/mach/m68k2/Unisoft_bug
+++ b/mach/m68k2/Unisoft_bug
@@ -8,9 +8,6 @@ installing ACK under UniSoft Unix:
    included in the Unisoft distribution, although it is standard V7 Unix).
    The file can be copied from the ACK-tree:
      cp /usr/em/include/assert.h /usr/include
-3) The file /lib/libln.a is called /lib/libl.a in Unisoft Unix.
-   The easiest way to fix this is to link the latter to the former:
-     ln /lib/libl.a /lib/libln.a
 
 The UniSoft C compiler we used contains a bug that will cause
 incorrect translations of the files getline.c and putline.c in
diff --git a/mach/m68k2/libfp/.distr b/mach/m68k2/libfp/.distr
index deec15c04..8f5939461 100644
--- a/mach/m68k2/libfp/.distr
+++ b/mach/m68k2/libfp/.distr
@@ -1,2 +1 @@
-Makefile
 byte_order.h
diff --git a/mach/m68k2/libsys/.distr b/mach/m68k2/libsys/.distr
index d5a561d2c..1edec9f14 100644
--- a/mach/m68k2/libsys/.distr
+++ b/mach/m68k2/libsys/.distr
@@ -1,5 +1,3 @@
 LIST
-Makefile
-compmodule
 head_em.s
 libmon_s.a
diff --git a/mach/m68k2/mach_params b/mach/m68k2/mach_params
new file mode 100644
index 000000000..118872a3d
--- /dev/null
+++ b/mach/m68k2/mach_params
@@ -0,0 +1,4 @@
+MACH=m68k2
+SUF=o
+ASAR=aal
+RANLIB=:
diff --git a/mach/m68k2/top/.distr b/mach/m68k2/top/.distr
index 2c8a26d1f..ecbe2e6d5 100644
--- a/mach/m68k2/top/.distr
+++ b/mach/m68k2/top/.distr
@@ -1,2 +1 @@
-Makefile
 table
diff --git a/mach/m68k4/.distr b/mach/m68k4/.distr
index 2b69cbd32..87d1405a0 100644
--- a/mach/m68k4/.distr
+++ b/mach/m68k4/.distr
@@ -1,10 +1,7 @@
 Action
 ncg
-libbc
-libcc
 libem
-libpc
-libsys
-liboc
+libend
 libfp
-libm2
+libsys
+mach_params
diff --git a/mach/m68k4/Action b/mach/m68k4/Action
index bd12283c6..e311e9232 100644
--- a/mach/m68k4/Action
+++ b/mach/m68k4/Action
@@ -4,24 +4,12 @@ end
 name "M68000 4-4 EM library"
 dir libem
 end
-name "M68000 4-4 system call library"
-dir libsys
-end
-name "M68000 4-4 C libraries"
-dir libcc
-end
-name "M68000 4-4 Basic library"
-dir libbc
-end
-name "M68000 4-4 Pascal library"
-dir libpc
-end
-name "M68000 4-4 Occam library"
-dir liboc
-end
-name "M68000 4-4 Modula-2 library"
-dir libm2
+name "M68000 4-4 etext,edata,end library"
+dir libend
 end
 name "M68000 4-4 floating point library"
 dir libfp
 end
+name "M68000 4-4 system call library"
+dir libsys
+end
diff --git a/mach/m68k4/libem/.distr b/mach/m68k4/libem/.distr
index ce020b7c5..d2b4f2884 100644
--- a/mach/m68k4/libem/.distr
+++ b/mach/m68k4/libem/.distr
@@ -1,9 +1,2 @@
 LIST
-Makefile
-compmodule
-em_end.s
-etext.s
-edata.s
-end.s
 libem_s.a
-READ_ME
diff --git a/mach/m68k4/libem/dia.s b/mach/m68k4/libem/dia.s
index b6ae89438..26b318374 100644
--- a/mach/m68k4/libem/dia.s
+++ b/mach/m68k4/libem/dia.s
@@ -114,7 +114,7 @@ putchar:
 	move.l	#1, -(sp)
 	pea	11(sp)
 	move.l	#1, -(sp)
-	jsr	_write
+	jsr	__write
 	lea	12(sp), sp
 	rts
 .align 2
diff --git a/mach/m68k4/libem/shp.s b/mach/m68k4/libem/shp.s
index ed3146822..9f3ce3d0a 100644
--- a/mach/m68k4/libem/shp.s
+++ b/mach/m68k4/libem/shp.s
@@ -13,7 +13,7 @@
 	and.l	#~0x3ff, d1
 	move.l	d1, -(sp)
 	move.l	d1,.limhp
-	jsr	_brk		! allocate 1K bytes of extra storage
+	jsr	__brk		! allocate 1K bytes of extra storage
 	add.l	#4, sp
 	tst.l	d0
 	bne	2f
diff --git a/mach/m68k4/libem/trp.s b/mach/m68k4/libem/trp.s
index f53112288..de72b9f5a 100644
--- a/mach/m68k4/libem/trp.s
+++ b/mach/m68k4/libem/trp.s
@@ -33,7 +33,6 @@
 	pea	fmt
 	jsr	.diagnos
 	add	#4,sp
-	jsr	__cleanup
 	jmp	EXIT
 
 	.sect .data
diff --git a/mach/m68k4/mach_params b/mach/m68k4/mach_params
new file mode 100644
index 000000000..b16c313d9
--- /dev/null
+++ b/mach/m68k4/mach_params
@@ -0,0 +1,4 @@
+MACH=m68k4
+SUF=o
+ASAR=aal
+RANLIB=:
diff --git a/mach/mantra/.distr b/mach/mantra/.distr
index 940b06645..6557e8cc2 100644
--- a/mach/mantra/.distr
+++ b/mach/mantra/.distr
@@ -1,7 +1,4 @@
 Action
 libsys
-libcc
-liboc
-libm2
 cv
 int
diff --git a/mach/mantra/mach_params b/mach/mantra/mach_params
new file mode 100644
index 000000000..e609dec09
--- /dev/null
+++ b/mach/mantra/mach_params
@@ -0,0 +1,4 @@
+MACH=mantra
+SUF=o
+ASAR=aal
+RANLIB=: