From c5fe8ce4dc8fc70dd8a6036470c1713bf7c774a0 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Tue, 27 Jan 1987 20:37:46 +0000
Subject: [PATCH] new version for assembler producing .o files

---
 mach/pmds/libsys/LIST       |  2 +-
 mach/pmds/libsys/Makefile   | 33 +++++++++++++++++++++++----------
 mach/pmds/libsys/access.s   |  9 +++++++--
 mach/pmds/libsys/alarm.s    |  9 +++++++--
 mach/pmds/libsys/cerror.s   |  9 +++++++--
 mach/pmds/libsys/chmod.s    |  9 +++++++--
 mach/pmds/libsys/chown.s    |  9 +++++++--
 mach/pmds/libsys/cleanup.s  |  7 ++++++-
 mach/pmds/libsys/close.s    |  9 +++++++--
 mach/pmds/libsys/compmodule |  4 ++++
 mach/pmds/libsys/creat.s    |  9 +++++++--
 mach/pmds/libsys/dup.s      |  9 +++++++--
 mach/pmds/libsys/exec.s     |  7 ++++++-
 mach/pmds/libsys/exit1.s    |  7 ++++++-
 mach/pmds/libsys/exit2.s    |  9 +++++++--
 mach/pmds/libsys/fork.s     |  7 ++++++-
 mach/pmds/libsys/fstat.s    |  9 +++++++--
 mach/pmds/libsys/getgid.s   |  9 +++++++--
 mach/pmds/libsys/getpid.s   |  7 ++++++-
 mach/pmds/libsys/getuid.s   |  9 +++++++--
 mach/pmds/libsys/gtty.s     |  7 ++++++-
 mach/pmds/libsys/head_em.s  | 27 ++++++++++++++++-----------
 mach/pmds/libsys/ioctl.s    |  9 +++++++--
 mach/pmds/libsys/kill.s     |  9 +++++++--
 mach/pmds/libsys/link.s     |  7 ++++++-
 mach/pmds/libsys/lseek.s    |  9 +++++++--
 mach/pmds/libsys/mknod.s    |  9 +++++++--
 mach/pmds/libsys/mount.s    |  9 +++++++--
 mach/pmds/libsys/nice.s     |  9 +++++++--
 mach/pmds/libsys/open.s     |  9 +++++++--
 mach/pmds/libsys/pause.s    |  7 ++++++-
 mach/pmds/libsys/pipe.s     |  7 ++++++-
 mach/pmds/libsys/profil.s   |  9 +++++++--
 mach/pmds/libsys/read.s     |  9 +++++++--
 mach/pmds/libsys/sbrk.s     | 17 +++++++++++------
 mach/pmds/libsys/signal.s   | 11 ++++++++---
 mach/pmds/libsys/stat.s     |  7 ++++++-
 mach/pmds/libsys/stty.s     |  7 ++++++-
 mach/pmds/libsys/time.s     |  9 +++++++--
 mach/pmds/libsys/unlink.s   |  7 ++++++-
 mach/pmds/libsys/wait.s     |  7 ++++++-
 mach/pmds/libsys/write.s    |  9 +++++++--
 42 files changed, 302 insertions(+), 90 deletions(-)
 create mode 100755 mach/pmds/libsys/compmodule

diff --git a/mach/pmds/libsys/LIST b/mach/pmds/libsys/LIST
index 5b2880001..43cdccb08 100644
--- a/mach/pmds/libsys/LIST
+++ b/mach/pmds/libsys/LIST
@@ -1,4 +1,4 @@
-tail_mon
+libmon_s.a
 gtty.s
 stty.s
 chmod.s
diff --git a/mach/pmds/libsys/Makefile b/mach/pmds/libsys/Makefile
index d3d832c33..1ae02d217 100644
--- a/mach/pmds/libsys/Makefile
+++ b/mach/pmds/libsys/Makefile
@@ -1,16 +1,29 @@
-install:
-	../../install head_em
-	../../install tail_mon
+# $Header$
+MACH=pmds
+all:		libmon_o.a head_em.o
 
-cmp:
-	-../../compare head_em
-	-../../compare tail_mon
+install: 	all
+		../../install head_em.o head_em
+		../../install libmon_o.a tail_mon
 
-clean :
+
+cmp:		all
+		-../../compare head_em.o head_em
+		-../../compare libmon_o.a tail_mon
+
+libmon_o.a:	libmon_s.a
+		ASAR=aal ; export ASAR ;\
+		march . libmon_o.a
+
+head_em.o:	head_em.s
+		$(MACH) -I../../../h -c head_em.s
+
+clean:
+		rm -f *.o libmon_o.a
 
 opr :
-	make pr | opr
+		make pr | opr
 
 pr:
-	@pr `pwd`/head_em
-	@arch pv tail_mon | pr -h `pwd`/tail_mon
+		@pr `pwd`/head_em.s
+		@arch pv libmon_s.a | pr -h `pwd`/libmon_s.a
diff --git a/mach/pmds/libsys/access.s b/mach/pmds/libsys/access.s
index 24a8235af..b2e4b0fdf 100644
--- a/mach/pmds/libsys/access.s
+++ b/mach/pmds/libsys/access.s
@@ -1,6 +1,11 @@
 .define _access
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _access
-.text
+.sect .text
 _access:
 tst.b -40(sp)
 link	a6,#-0
@@ -13,7 +18,7 @@ add.l #8,sp
 unlk a6
 rts
 __Saccess:		trap #0
-.short	0x21
+.data2	0x21
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/alarm.s b/mach/pmds/libsys/alarm.s
index 88bcb728c..4688339fa 100644
--- a/mach/pmds/libsys/alarm.s
+++ b/mach/pmds/libsys/alarm.s
@@ -1,6 +1,11 @@
 .define _alarm
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _alarm
-.text
+.sect .text
 _alarm:
 tst.b -40(sp)
 link	a6,#-0
@@ -11,5 +16,5 @@ add.l #4,sp
 unlk a6
 rts
 __Salarm:		trap #0
-.short	0x1B
+.data2	0x1B
 			rts
diff --git a/mach/pmds/libsys/cerror.s b/mach/pmds/libsys/cerror.s
index d9fff34c9..a69e2021e 100644
--- a/mach/pmds/libsys/cerror.s
+++ b/mach/pmds/libsys/cerror.s
@@ -1,9 +1,14 @@
 .define cerror
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern cerror
 cerror:			move.l d0,_errno
 			move.l #-1,d0
 			rts
-.bss
+.sect .bss
 _errno:
 			.space 4
-.text
+.sect .text
diff --git a/mach/pmds/libsys/chmod.s b/mach/pmds/libsys/chmod.s
index 3e6287695..ba5cae082 100644
--- a/mach/pmds/libsys/chmod.s
+++ b/mach/pmds/libsys/chmod.s
@@ -1,6 +1,11 @@
 .define _chmod
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _chmod
-.text
+.sect .text
 _chmod:
 tst.b -40(sp)
 link	a6,#-0
@@ -13,7 +18,7 @@ add.l #8,sp
 unlk a6
 rts
 __Schmod:		trap #0
-.short	0xF
+.data2	0xF
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/chown.s b/mach/pmds/libsys/chown.s
index 8cd896804..16f602bbf 100644
--- a/mach/pmds/libsys/chown.s
+++ b/mach/pmds/libsys/chown.s
@@ -1,6 +1,11 @@
 .define _chown
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _chown
-.text
+.sect .text
 _chown:
 tst.b -40(sp)
 link	a6,#-0
@@ -16,7 +21,7 @@ lea 12(sp),sp
 unlk a6
 rts
 __Schown:		trap #0
-.short	0x10
+.data2	0x10
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/cleanup.s b/mach/pmds/libsys/cleanup.s
index ce4a76359..db80fbf18 100644
--- a/mach/pmds/libsys/cleanup.s
+++ b/mach/pmds/libsys/cleanup.s
@@ -1,5 +1,10 @@
 .define __cleanup
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern __cleanup
-.text
+.sect .text
 __cleanup:
 rts
diff --git a/mach/pmds/libsys/close.s b/mach/pmds/libsys/close.s
index a32ac79c8..6432b570a 100644
--- a/mach/pmds/libsys/close.s
+++ b/mach/pmds/libsys/close.s
@@ -1,6 +1,11 @@
 .define _close
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _close
-.text
+.sect .text
 _close:
 tst.b -40(sp)
 link	a6,#-0
@@ -12,7 +17,7 @@ add.l #4,sp
 unlk a6
 rts
 __Sclose:		trap #0
-.short	0x6
+.data2	0x6
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/compmodule b/mach/pmds/libsys/compmodule
new file mode 100755
index 000000000..38b533558
--- /dev/null
+++ b/mach/pmds/libsys/compmodule
@@ -0,0 +1,4 @@
+if pmds -c $1 1>&2
+then echo `basename $1 $2`.o
+else exit 1
+fi
diff --git a/mach/pmds/libsys/creat.s b/mach/pmds/libsys/creat.s
index 88df10317..2b1a14b8b 100644
--- a/mach/pmds/libsys/creat.s
+++ b/mach/pmds/libsys/creat.s
@@ -1,6 +1,11 @@
 .define _creat
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _creat
-.text
+.sect .text
 _creat:
 tst.b -40(sp)
 link	a6,#-0
@@ -13,7 +18,7 @@ add.l #8,sp
 unlk a6
 rts
 __Screat:		trap #0
-.short	0x8
+.data2	0x8
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/dup.s b/mach/pmds/libsys/dup.s
index f189fb53d..325836475 100644
--- a/mach/pmds/libsys/dup.s
+++ b/mach/pmds/libsys/dup.s
@@ -1,7 +1,12 @@
 .define _dup
 .define _dup2
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _dup
-.text
+.sect .text
 _dup:
 tst.b -40(sp)
 link	a6,#-0
@@ -29,7 +34,7 @@ rts
 __Sdup2:		or.l	#64,4(sp)
 
 __Sdup:			trap #0
-.short	0x29
+.data2	0x29
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/exec.s b/mach/pmds/libsys/exec.s
index 22a8260dd..b10f3eada 100644
--- a/mach/pmds/libsys/exec.s
+++ b/mach/pmds/libsys/exec.s
@@ -1,6 +1,11 @@
 .define _execl
 .define _execve
 .define _execv
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _execl
 .extern _execve
 .extern _execv
@@ -14,7 +19,7 @@ _execl:		tst.b -48(sp)
 		unlk a6
 		rts
 _execve:	trap #0
-.short 59
+.data2 59
 		jmp cerror
 _execv:		tst.b -48(sp)
 		link a6,#0
diff --git a/mach/pmds/libsys/exit1.s b/mach/pmds/libsys/exit1.s
index d766750e7..d55733815 100644
--- a/mach/pmds/libsys/exit1.s
+++ b/mach/pmds/libsys/exit1.s
@@ -1,6 +1,11 @@
 .define _exit
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _exit
-.text
+.sect .text
 _exit:
 tst.b -40(sp)
 link	a6,#-0
diff --git a/mach/pmds/libsys/exit2.s b/mach/pmds/libsys/exit2.s
index ea2bea6f4..dec1340b4 100644
--- a/mach/pmds/libsys/exit2.s
+++ b/mach/pmds/libsys/exit2.s
@@ -1,6 +1,11 @@
 .define __exit
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern __exit
-.text
+.sect .text
 __exit:
 tst.b -40(sp)
 link	a6,#-0
@@ -12,4 +17,4 @@ add.l #4,sp
 unlk a6
 rts
 __Sexit:		trap #0
-.short			0x1
+.data2			0x1
diff --git a/mach/pmds/libsys/fork.s b/mach/pmds/libsys/fork.s
index ca96887de..e9438185e 100644
--- a/mach/pmds/libsys/fork.s
+++ b/mach/pmds/libsys/fork.s
@@ -1,7 +1,12 @@
 .define _fork
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _fork
 _fork:		trap #0
-.short 0x2
+.data2 0x2
 		bra 3f
 		rts
 3:
diff --git a/mach/pmds/libsys/fstat.s b/mach/pmds/libsys/fstat.s
index 3aaee95ea..0ba354746 100644
--- a/mach/pmds/libsys/fstat.s
+++ b/mach/pmds/libsys/fstat.s
@@ -1,6 +1,11 @@
 .define _fstat
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _fstat
-.text
+.sect .text
 _fstat:
 tst.b -40(sp)
 link	a6,#-0
@@ -13,7 +18,7 @@ add.l #8,sp
 unlk a6
 rts
 __Sfstat:		trap #0
-.short	0x1C
+.data2	0x1C
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/getgid.s b/mach/pmds/libsys/getgid.s
index 098977ada..9f945f2c3 100644
--- a/mach/pmds/libsys/getgid.s
+++ b/mach/pmds/libsys/getgid.s
@@ -1,12 +1,17 @@
 .define _getgid
 .define _getegid
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _getgid
 .extern _getegid
 _getgid:		trap #0
-.short	0x2F
+.data2	0x2F
 			rts
 
 _getegid:		trap #0
-.short	0x2F
+.data2	0x2F
 			move.l	d1,d0
 			rts
diff --git a/mach/pmds/libsys/getpid.s b/mach/pmds/libsys/getpid.s
index 75894271d..e676b5081 100644
--- a/mach/pmds/libsys/getpid.s
+++ b/mach/pmds/libsys/getpid.s
@@ -1,5 +1,10 @@
 .define _getpid
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _getpid
 _getpid:		trap #0
-.short	0x14
+.data2	0x14
 			rts
diff --git a/mach/pmds/libsys/getuid.s b/mach/pmds/libsys/getuid.s
index 53f6b0be9..487c6fb81 100644
--- a/mach/pmds/libsys/getuid.s
+++ b/mach/pmds/libsys/getuid.s
@@ -1,12 +1,17 @@
 .define _getuid
 .define _geteuid
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _getuid
 .extern _geteuid
 _getuid:		trap #0
-.short	0x18
+.data2	0x18
 			rts
 
 _geteuid:		trap #0
-.short	0x18
+.data2	0x18
 			move.l	d1,d0
 			rts
diff --git a/mach/pmds/libsys/gtty.s b/mach/pmds/libsys/gtty.s
index ee9f096c8..50b6e8bfc 100644
--- a/mach/pmds/libsys/gtty.s
+++ b/mach/pmds/libsys/gtty.s
@@ -1,6 +1,11 @@
 .define _gtty
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _gtty
-.text
+.sect .text
 _gtty:
 tst.b -40(sp)
 link	a6,#-0
diff --git a/mach/pmds/libsys/head_em.s b/mach/pmds/libsys/head_em.s
index 92d4f2e77..6e410b2de 100644
--- a/mach/pmds/libsys/head_em.s
+++ b/mach/pmds/libsys/head_em.s
@@ -1,12 +1,17 @@
 .define	CERASE,CKILL,CSTOP,CSTART
 .define .lino,.filn
-
 .define F_DUM,EXIT
-
 .define	begtext,begdata,begbss
 .define	EARRAY,ERANGE,ESET,EIDIVZ,EHEAP,EILLINS,ECASE
 .define	hol0,.reghp,.limhp,.trpim,.trppc
 .define	LINO_AD,FILN_AD
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
+
+
 
 
 CERASE	= 010
@@ -27,7 +32,7 @@ EHEAP	= 17
 EILLINS	= 18
 ECASE	= 20
 
-	.text
+	.sect .text
 begtext:
 	add.l	#2,sp !convert argc from 4-byte to 2-byte
 	pea	endbss
@@ -37,22 +42,22 @@ begtext:
 	add	#010,sp
 EXIT:
 
-	.data
+	.sect .data
 begdata:
 hol0:
 .lino:
-	.short	0,0	! lino
+	.data2	0,0	! lino
 .filn:
-	.long	0	! filn
+	.data4	0	! filn
 .reghp:
-	.long	endbss
+	.data4	endbss
 .limhp:
-	.long	endbss
+	.data4	endbss
 .trppc:
-	.long	0
+	.data4	0
 .trpim:
-	.short	0
+	.data2	0
 
 
-	.bss
+	.sect .bss
 begbss:
diff --git a/mach/pmds/libsys/ioctl.s b/mach/pmds/libsys/ioctl.s
index fea858793..86a784be2 100644
--- a/mach/pmds/libsys/ioctl.s
+++ b/mach/pmds/libsys/ioctl.s
@@ -1,6 +1,11 @@
 .define _ioctl
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _ioctl
-.text
+.sect .text
 _ioctl:
 tst.b -40(sp)
 link	a6,#-0
@@ -16,7 +21,7 @@ lea 12(sp),sp
 unlk a6
 rts
 __Sioctl:		trap #0
-.short	0x36
+.data2	0x36
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/kill.s b/mach/pmds/libsys/kill.s
index d900ac2ba..a880c21e5 100644
--- a/mach/pmds/libsys/kill.s
+++ b/mach/pmds/libsys/kill.s
@@ -1,6 +1,11 @@
 .define _kill
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _kill
-.text
+.sect .text
 _kill:
 tst.b -40(sp)
 link	a6,#-0
@@ -15,7 +20,7 @@ add.l #8,sp
 unlk a6
 rts
 __Skill:		trap #0
-.short	0x25
+.data2	0x25
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/link.s b/mach/pmds/libsys/link.s
index e1531b952..7a07106a5 100644
--- a/mach/pmds/libsys/link.s
+++ b/mach/pmds/libsys/link.s
@@ -1,7 +1,12 @@
 .define _link
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _link
 _link:			trap #0
-.short	0x9
+.data2	0x9
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/lseek.s b/mach/pmds/libsys/lseek.s
index 8be8d2bd9..c27a93f24 100644
--- a/mach/pmds/libsys/lseek.s
+++ b/mach/pmds/libsys/lseek.s
@@ -1,6 +1,11 @@
 .define _lseek
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _lseek
-.text
+.sect .text
 _lseek:
 tst.b -40(sp)
 link	a6,#-0
@@ -16,7 +21,7 @@ lea 12(sp),sp
 unlk a6
 rts
 __Slseek:		trap #0
-.short	0x13
+.data2	0x13
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/mknod.s b/mach/pmds/libsys/mknod.s
index 306035fdd..d2f86fe24 100644
--- a/mach/pmds/libsys/mknod.s
+++ b/mach/pmds/libsys/mknod.s
@@ -1,6 +1,11 @@
 .define _mknod
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _mknod
-.text
+.sect .text
 _mknod:
 tst.b -40(sp)
 link	a6,#-0
@@ -16,7 +21,7 @@ lea 12(sp),sp
 unlk a6
 rts
 __Smknod:		trap #0
-.short	0xE
+.data2	0xE
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/mount.s b/mach/pmds/libsys/mount.s
index 849678353..d890ac56b 100644
--- a/mach/pmds/libsys/mount.s
+++ b/mach/pmds/libsys/mount.s
@@ -1,6 +1,11 @@
 .define _mount
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _mount
-.text
+.sect .text
 _mount:
 tst.b -40(sp)
 link	a6,#-0
@@ -14,7 +19,7 @@ lea 12(sp),sp
 unlk a6
 rts
 __Smount:		trap #0
-.short	0x15
+.data2	0x15
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/nice.s b/mach/pmds/libsys/nice.s
index b264a5d6e..6eddc6fa8 100644
--- a/mach/pmds/libsys/nice.s
+++ b/mach/pmds/libsys/nice.s
@@ -1,6 +1,11 @@
 .define _nice
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _nice
-.text
+.sect .text
 _nice:
 tst.b -40(sp)
 link	a6,#-0
@@ -12,7 +17,7 @@ add.l #4,sp
 unlk a6
 rts
 __Snice:		trap #0
-.short	0x22
+.data2	0x22
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/open.s b/mach/pmds/libsys/open.s
index 6a9476224..bb1bd144b 100644
--- a/mach/pmds/libsys/open.s
+++ b/mach/pmds/libsys/open.s
@@ -1,6 +1,11 @@
 .define _open
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _open
-.text
+.sect .text
 _open:
 tst.b -40(sp)
 link	a6,#-0
@@ -13,7 +18,7 @@ add.l #8,sp
 unlk a6
 rts
 __Sopen:		trap #0
-.short	0x5
+.data2	0x5
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/pause.s b/mach/pmds/libsys/pause.s
index 3ce0e8c9c..4db34d46a 100644
--- a/mach/pmds/libsys/pause.s
+++ b/mach/pmds/libsys/pause.s
@@ -1,7 +1,12 @@
 .define _pause
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _pause
 _pause:		trap #0
-.short 29
+.data2 29
 		bcc 1f
 		jmp cerror
 1:
diff --git a/mach/pmds/libsys/pipe.s b/mach/pmds/libsys/pipe.s
index 0b57d35f5..8691aa32e 100644
--- a/mach/pmds/libsys/pipe.s
+++ b/mach/pmds/libsys/pipe.s
@@ -1,7 +1,12 @@
 .define _pipe
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _pipe
 _pipe:		trap #0
-.short 0x2A
+.data2 0x2A
 		bcc 1f
 		jmp cerror
 1:
diff --git a/mach/pmds/libsys/profil.s b/mach/pmds/libsys/profil.s
index 475087c06..054d9b10f 100644
--- a/mach/pmds/libsys/profil.s
+++ b/mach/pmds/libsys/profil.s
@@ -1,6 +1,11 @@
 .define _profil
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _profil
-.text
+.sect .text
 _profil:
 tst.b -40(sp)
 link	a6,#-0
@@ -19,5 +24,5 @@ lea 16(sp),sp
 unlk a6
 rts
 __Sprofil:		trap #0
-.short	0x2C
+.data2	0x2C
 			rts
diff --git a/mach/pmds/libsys/read.s b/mach/pmds/libsys/read.s
index ccf421ca6..47b3e8ae6 100644
--- a/mach/pmds/libsys/read.s
+++ b/mach/pmds/libsys/read.s
@@ -1,6 +1,11 @@
 .define _read
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _read
-.text
+.sect .text
 _read:
 tst.b -40(sp)
 link	a6,#-0
@@ -16,7 +21,7 @@ lea 12(sp),sp
 unlk a6
 rts
 __Sread:		trap #0
-.short	0x3
+.data2	0x3
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/sbrk.s b/mach/pmds/libsys/sbrk.s
index 4ec68dcee..f9c4d3a79 100644
--- a/mach/pmds/libsys/sbrk.s
+++ b/mach/pmds/libsys/sbrk.s
@@ -1,7 +1,12 @@
 .define _brk
 .define _sbrk
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _brk
-.text
+.sect .text
 _brk:
 tst.b -40(sp)
 link	a6,#-0
@@ -28,7 +33,7 @@ __Ssbrk:		tst.b	-8(sp)
 			move.l	d0,-(sp)
 			clr.l	-(sp)
 			trap #0
-.short	0x11
+.data2	0x11
 			add.l	#8,sp
 			bcc	1f
 			jmp	cerror
@@ -38,13 +43,13 @@ __Ssbrk:		tst.b	-8(sp)
 			add.l	d1,nd
 			rts
 __Sbrk:			trap #0
-.short	0x11
+.data2	0x11
 			bcc	1f
 			jmp	cerror
 1:
 			move.l	4(sp),nd
 			clr.l	d0
 			rts
-.data
-nd:			.long endbss
-.text
+.sect .data
+nd:			.data4 endbss
+.sect .text
diff --git a/mach/pmds/libsys/signal.s b/mach/pmds/libsys/signal.s
index d5c86f5d4..a091b3fa7 100644
--- a/mach/pmds/libsys/signal.s
+++ b/mach/pmds/libsys/signal.s
@@ -1,4 +1,9 @@
 .define _signal
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _signal
 NSIG=32
 _signal:
@@ -22,7 +27,7 @@ _signal:
 	move.l	d0,-(sp)
 	clr.l	-(sp)
 	trap #0
-.short 	48
+.data2 	48
 	add.l	#12,sp
 	bcs	3f
 	btst	#0,d0
@@ -49,6 +54,6 @@ enter:
 	movem.l	(sp)+,d0/d1/a0/a1
 	add.l	#4,sp
 	rtr
-.bss
+.sect .bss
 dvect: .space 4*NSIG
-.text
+.sect .text
diff --git a/mach/pmds/libsys/stat.s b/mach/pmds/libsys/stat.s
index 45dfa7555..2d41ec45e 100644
--- a/mach/pmds/libsys/stat.s
+++ b/mach/pmds/libsys/stat.s
@@ -1,7 +1,12 @@
 .define _stat
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _stat
 _stat:			trap #0
-.short	0x12
+.data2	0x12
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/stty.s b/mach/pmds/libsys/stty.s
index 46a497cd8..ddc621c11 100644
--- a/mach/pmds/libsys/stty.s
+++ b/mach/pmds/libsys/stty.s
@@ -1,6 +1,11 @@
 .define _stty
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _stty
-.text
+.sect .text
 _stty:
 tst.b -40(sp)
 link	a6,#-0
diff --git a/mach/pmds/libsys/time.s b/mach/pmds/libsys/time.s
index dce236575..a30be11c1 100644
--- a/mach/pmds/libsys/time.s
+++ b/mach/pmds/libsys/time.s
@@ -1,9 +1,14 @@
 .define _time
 .define _ftime
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _time
 _time:
 	trap #0
-.short	0xD
+.data2	0xD
 	tst.l 4(sp)
 	beq 1f
 	move.l 4(sp),a0
@@ -13,7 +18,7 @@ _time:
 .extern _ftime
 _ftime:
 	trap #0
-.short 0x23
+.data2 0x23
 	bcc 1f
 	jmp cerror
 1:
diff --git a/mach/pmds/libsys/unlink.s b/mach/pmds/libsys/unlink.s
index 2093ce74d..14fd3b79f 100644
--- a/mach/pmds/libsys/unlink.s
+++ b/mach/pmds/libsys/unlink.s
@@ -1,7 +1,12 @@
 .define _unlink
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _unlink
 _unlink:		trap #0
-.short	0xA
+.data2	0xA
 			bcc	1f
 			jmp	cerror
 1:
diff --git a/mach/pmds/libsys/wait.s b/mach/pmds/libsys/wait.s
index fa84833cf..f994c3aff 100644
--- a/mach/pmds/libsys/wait.s
+++ b/mach/pmds/libsys/wait.s
@@ -1,7 +1,12 @@
 .define _wait
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _wait
 _wait:		trap #0
-.short 0x7
+.data2 0x7
 		bcc 1f
 		jmp cerror
 1:
diff --git a/mach/pmds/libsys/write.s b/mach/pmds/libsys/write.s
index 8789104ee..c044d2dae 100644
--- a/mach/pmds/libsys/write.s
+++ b/mach/pmds/libsys/write.s
@@ -1,6 +1,11 @@
 .define _write
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.sect .text
 .extern _write
-.text
+.sect .text
 _write:
 tst.b -40(sp)
 link	a6,#-0
@@ -16,7 +21,7 @@ lea 12(sp),sp
 unlk a6
 rts
 __Swrite:		trap #0
-.short	0x4
+.data2	0x4
 			bcc	1f
 			jmp	cerror
 1:
-- 
2.34.1