From 74edeea849bab0c6d29bbecc4ee9489d090e0200 Mon Sep 17 00:00:00 2001
From: eck <none@none>
Date: Fri, 28 Sep 1990 09:47:50 +0000
Subject: [PATCH] changed end_em to avoid namespace pollution

---
 mach/vax4/libem/.distr   |  3 +++
 mach/vax4/libem/Makefile | 19 ++++++++++++-------
 mach/vax4/libem/edata.s  |  9 +++++++++
 mach/vax4/libem/em_end.s | 22 ++++++++++++++++++++++
 mach/vax4/libem/end.s    | 17 ++---------------
 mach/vax4/libem/etext.s  |  9 +++++++++
 6 files changed, 57 insertions(+), 22 deletions(-)
 create mode 100644 mach/vax4/libem/edata.s
 create mode 100644 mach/vax4/libem/em_end.s
 create mode 100644 mach/vax4/libem/etext.s

diff --git a/mach/vax4/libem/.distr b/mach/vax4/libem/.distr
index 8702677e5..a61e67f9b 100644
--- a/mach/vax4/libem/.distr
+++ b/mach/vax4/libem/.distr
@@ -2,4 +2,7 @@ LIST
 Makefile
 compmodule
 libem_s.a
+em_end.s
+etext.s
+edata.s
 end.s
diff --git a/mach/vax4/libem/Makefile b/mach/vax4/libem/Makefile
index 79cd7c6fb..7588a8ea6 100644
--- a/mach/vax4/libem/Makefile
+++ b/mach/vax4/libem/Makefile
@@ -1,28 +1,33 @@
 # $Header$
 MACH=vax4
-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:
-		rm -f *.o libem_o.a
+		rm -f *.o libem_o.a end.a
 
 opr :
 		make pr | opr
 
 pr:
 		@arch pv libem_s.a | pr -h `pwd`/libem_s.a
-		@pr `pwd`/end.s
+		@pr `pwd`/em_end.s `pwd`/edata.s `pwd`/etext.s `pwd`/end.s
diff --git a/mach/vax4/libem/edata.s b/mach/vax4/libem/edata.s
new file mode 100644
index 000000000..f53adc109
--- /dev/null
+++ b/mach/vax4/libem/edata.s
@@ -0,0 +1,9 @@
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.define	_edata
+.sect .data
+	.align 4
+	.sect .data
+_edata:
diff --git a/mach/vax4/libem/em_end.s b/mach/vax4/libem/em_end.s
new file mode 100644
index 000000000..a062368da
--- /dev/null
+++ b/mach/vax4/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, __end and endbss.
+
+	.sect .text
+endtext:
+	.sect .data
+enddata:
+	.sect .end
+__end:
+endbss:
diff --git a/mach/vax4/libem/end.s b/mach/vax4/libem/end.s
index bdd787237..93a1e6e00 100644
--- a/mach/vax4/libem/end.s
+++ b/mach/vax4/libem/end.s
@@ -1,20 +1,7 @@
-.define	endtext,enddata,endbss,_etext,_edata,_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:
-_etext:
-	.sect .data
-enddata:
-_edata:
-	.sect .end
+.define	_end
+.sect .end ! only for declaration of _end, __end and endbss.
 _end:
-endbss:
diff --git a/mach/vax4/libem/etext.s b/mach/vax4/libem/etext.s
new file mode 100644
index 000000000..8c7453cb4
--- /dev/null
+++ b/mach/vax4/libem/etext.s
@@ -0,0 +1,9 @@
+.sect .text
+.sect .rom
+.sect .data
+.sect .bss
+.define	_etext
+.sect .text
+	.align 4
+	.sect .text
+_etext:
-- 
2.34.1