changed end_em to avoid namespace pollution

diff --git a/mach/vax4/libem/.distr b/mach/vax4/libem/.distr
index 8702677..a61e67f 100644 (file)
--- 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 79cd7c6..7588a8e 100644 (file)
--- 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 (file)
index 0000000..f53adc1
--- /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 (file)
index 0000000..a062368
--- /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 bdd7872..93a1e6e 100644 (file)
--- 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 (file)
index 0000000..8c7453c
--- /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: