changed end_em to library to avoid namespace pollution

mach/m68020/libem/.distr

@@ -1,6 +1,9 @@
 LIST
 Makefile
 compmodule
+em_end.s
+etext.s
+edata.s
 end.s
 libem_s.a
 trpstr.c

mach/m68020/libem/Makefile

@@ -1,20 +1,25 @@
 # $Header$
 MACH=m68020
-all:            libem_o.a end.o
+ASAR=aal
+all:		libem_o.a end.a
 
 install: 	all
 		../../install libem_o.a tail_em
-		../../install end.o end_em
+		../../install end.a end_em
 
 cmp:		all
 		-../../compare libem_o.a tail_em
-		-../../compare end.o end_em
+		-../../compare end.a end_em
 
-end.o:		end.s
+end.a:		em_end.s etext.s edata.s end.s
+		$(MACH) -I../../../h -c em_end.s
+		$(MACH) -I../../../h -c edata.s
+		$(MACH) -I../../../h -c etext.s
 		$(MACH) -I../../../h -c end.s
+		$(ASAR) cr end.a em_end.o etext.o edata.o end.o
 
 libem_o.a:	libem_s.a
-		ASAR=aal ; export ASAR ;\
+		ASAR=$(ASAR) ; export ASAR ;\
 		march . libem_o.a
 
 clean:

mach/m68020/libem/dia.s

@@ -112,7 +112,7 @@ putchar:
 	move.l	#1, -(sp)
 	pea	(11,sp)
 	move.l	#1, -(sp)
-	jsr	(_write)
+	jsr	(__write)
 	lea	(12, sp), sp
 	rts
 .align 2

mach/m68020/libem/edata.s

@@ -0,0 +1,9 @@
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.define	_edata
+.sect .data
+	.align 4
+	.sect .data
+_edata:

mach/m68020/libem/em_end.s

@@ -0,0 +1,22 @@
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.define	endtext,enddata,endbss,__end
+.sect .text
+	.align 4
+.sect .rom
+	.align 4
+.sect .data
+	.align 4
+.sect .bss
+	.align 4
+.sect .end ! only for declaration of _end and endbss.
+
+	.sect .text
+endtext:
+	.sect .data
+enddata:
+	.sect .end
+__end:
+endbss:

mach/m68020/libem/end.s

@@ -1,20 +1,8 @@
-.define	endtext,enddata,endbss,_etext,_edata,_end
 .sect .text
-	.align 4
 .sect .rom
-	.align 4
 .sect .data
-	.align 4
 .sect .bss
-	.align 4
+.define	_end
-.sect .end ! only for declaration of _end and endbss.
+.sect .end ! only for declaration of _end, __end and endbss.
-
-	.sect .text
-endtext:
-_etext:
-	.sect .data
-enddata:
-_edata:
 	.sect .end
 _end:
-endbss:

mach/m68020/libem/etext.s

@@ -0,0 +1,9 @@
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.define	_etext
+.sect .text
+	.align 4
+	.sect .text
+_etext:

mach/m68020/libem/shp.s

@@ -14,7 +14,7 @@ EHEAP=17
 	add.l	#0x400, d1
 	and.l	#~0x3ff, d1
 	move.l	d1, -(sp)
-	jsr	(_brk)		! allocate 1K bytes of extra storage
+	jsr	(__brk)		! allocate 1K bytes of extra storage
 	bcs	2f
 	move.l	(sp)+,(.limhp)
 1: