New installation mechanism

diff --git a/mach/m68k2/.distr b/mach/m68k2/.distr
index 280ad84..7d818f7 100644 (file)
--- 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 00478dc..53f3331 100644 (file)
--- 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
+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 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
-end
-name "Motorola 68000 2-4 floating point library"
-dir libfp
+name "Motorola 68000 2-4 conversion program"
+dir cv
 end

diff --git a/mach/m68k2/Unisoft_bug b/mach/m68k2/Unisoft_bug
index af46314..bb21760 100644 (file)
--- 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 deec15c..8f59394 100644 (file)
--- 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 d5a561d..1edec9f 100644 (file)
--- 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 (file)
index 0000000..118872a
--- /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 2c8a26d..ecbe2e6 100644 (file)
--- 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 2b69cbd..87d1405 100644 (file)
--- 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 bd12283..e311e92 100644 (file)
--- 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 ce020b7..d2b4f28 100644 (file)
--- 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 b6ae894..26b3183 100644 (file)
--- 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 ed31468..9f3ce3d 100644 (file)
--- 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 f531122..de72b9f 100644 (file)
--- 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 (file)
index 0000000..b16c313
--- /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 940b066..6557e8c 100644 (file)
--- 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 (file)
index 0000000..e609dec
--- /dev/null
+++ b/mach/mantra/mach_params
@@ -0,0 +1,4 @@
+MACH=mantra
+SUF=o
+ASAR=aal
+RANLIB=: