d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Many fixes

Browse source
This commit is contained in:
ceriel 1991-09-18 10:02:37 +00:00
parent 16b2c7c173
commit a0858c04e4
11 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mach/proto/libg/proto.libbc
View file

@ -6,6 +6,7 @@
MACHDEF= \ MACHDEF= \
"MACH=$(MACH)" \ "MACH=$(MACH)" \
"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
"SUF=$(SUF)" \ "SUF=$(SUF)" \
"ASAR=$(ASAR)" \ "ASAR=$(ASAR)" \
"RANLIB=$(RANLIB)" \ "RANLIB=$(RANLIB)" \
@ -13,7 +14,8 @@ MACHDEF= \
"TARGET_HOME=$(TARGET_HOME)" \ "TARGET_HOME=$(TARGET_HOME)" \
"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule" "COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile MAKEFILE=../../proto/libg/Makefile
LIBBC="PREF=bc" "SRC=lang/basic/lib" LIBBC="PREF=bc" "SRC=lang/basic/lib"
all: libbc all: libbc

3
mach/proto/libg/proto.libcc
View file

@ -6,6 +6,7 @@
MACHDEF= \ MACHDEF= \
"MACH=$(MACH)" \ "MACH=$(MACH)" \
"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
"SUF=$(SUF)" \ "SUF=$(SUF)" \
"ASAR=$(ASAR)" \ "ASAR=$(ASAR)" \
"RANLIB=$(RANLIB)" \ "RANLIB=$(RANLIB)" \
@ -13,7 +14,7 @@ MACHDEF= \
"TARGET_HOME=$(TARGET_HOME)" \ "TARGET_HOME=$(TARGET_HOME)" \
"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule" "COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile MAKEFILE=../../proto/libg/Makefile
STDIO="PREF=cc" "SUB=.1s" "SRC=lang/cem/libcc/stdio" STDIO="PREF=cc" "SUB=.1s" "SRC=lang/cem/libcc/stdio"
GEN="PREF=cc" "SUB=.2g" "SRC=lang/cem/libcc/gen" GEN="PREF=cc" "SUB=.2g" "SRC=lang/cem/libcc/gen"
LIBM="PREF=m" "SRC=lang/cem/libcc/math" LIBM="PREF=m" "SRC=lang/cem/libcc/math"

3
mach/proto/libg/proto.libem
View file

@ -12,7 +12,8 @@ libem_o.a: $(SRC_DIR)/libem_s.a
ASAR="$(ASAR)" ; export ASAR ; \ ASAR="$(ASAR)" ; export ASAR ; \
RANLIB="$(RANLIB)" ; export RANLIB ; \ RANLIB="$(RANLIB)" ; export RANLIB ; \
MACH="$(MACH)" ; export MACH ; \ MACH="$(MACH)" ; export MACH ; \
MACHFL="$(MACHFL)" ; export MACHFL ; \ SUF="$(SUF)" ; export SUF ; \
MACHFL="$(MACHFL) -I$(TARGET_HOME)/h" ; export MACHFL ; \
if [ $(SUF) = o ] ; then march $(SRC_DIR) libem_o.a $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libem_s.a libem_o.a ; fi if [ $(SUF) = o ] ; then march $(SRC_DIR) libem_o.a $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libem_s.a libem_o.a ; fi
install: all install: all

9
mach/proto/libg/proto.libend
View file

@ -8,12 +8,14 @@ SRC_DIR = $(SRC_HOME)/mach/$(MACH)/libend
all: end_o.a all: end_o.a
end_o.a: $(SRC_DIR)/end_s.a end_o.a:
ASAR="$(ASAR)" ; export ASAR ; \ ASAR="$(ASAR)" ; export ASAR ; \
RANLIB="$(RANLIB)" ; export RANLIB ; \ RANLIB="$(RANLIB)" ; export RANLIB ; \
MACH="$(MACH)" ; export MACH ; \ MACH="$(MACH)" ; export MACH ; \
SUF="$(SUF)" ; export SUF ; \
MACHFL="$(MACHFL)" ; export MACHFL ; \ MACHFL="$(MACHFL)" ; export MACHFL ; \
if [ $(SUF) = o ] march $(SRC_DIR) end_o.a $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/end_s.a end_o.a ; fi LIB=`head -1 $(SRC_DIR)/LIST` ; export LIB ; \
if [ $(SUF) = o -o $(SUF) = m ] ; then march $(SRC_DIR) end_o.a $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/$$LIB end_o.a ; fi
install: all install: all
cp end_o.a $(TARGET_HOME)/lib/$(MACH)/end_em cp end_o.a $(TARGET_HOME)/lib/$(MACH)/end_em
@ -29,4 +31,5 @@ opr:
make pr | opr make pr | opr
pr: pr:
arch pv $(SRC_DIR)/end_s.a | pr -h $(SRC_DIR)/end_s.a LIB=`head -1 $(SRC_DIR)/LIST` ; export LIB ; \
arch pv $(SRC_DIR)/$$LIB | pr -h $(SRC_DIR)/$$LIB

3
mach/proto/libg/proto.libm2
View file

@ -6,6 +6,7 @@
MACHDEF= \ MACHDEF= \
"MACH=$(MACH)" \ "MACH=$(MACH)" \
"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
"SUF=$(SUF)" \ "SUF=$(SUF)" \
"ASAR=$(ASAR)" \ "ASAR=$(ASAR)" \
"RANLIB=$(RANLIB)" \ "RANLIB=$(RANLIB)" \
@ -13,7 +14,7 @@ MACHDEF= \
"TARGET_HOME=$(TARGET_HOME)" \ "TARGET_HOME=$(TARGET_HOME)" \
"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule" "COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile MAKEFILE=../../proto/libg/Makefile
LIBM2="PREF=m2" "SRC=lang/m2/libm2" LIBM2="PREF=m2" "SRC=lang/m2/libm2"
all: libm2 all: libm2

5
mach/proto/libg/proto.libmon
View file

@ -12,11 +12,12 @@ libmon: $(SRC_DIR)/libmon_s.a
ASAR="$(ASAR)" ; export ASAR ; \ ASAR="$(ASAR)" ; export ASAR ; \
RANLIB="$(RANLIB)" ; export RANLIB ; \ RANLIB="$(RANLIB)" ; export RANLIB ; \
MACH="$(MACH)" ; export MACH ; \ MACH="$(MACH)" ; export MACH ; \
SUF="$(SUF)" ; export SUF ; \
MACHFL="$(MACHFL)" ; export MACHFL ; \ MACHFL="$(MACHFL)" ; export MACHFL ; \
if [ $(SUF) = o ] march $(SRC_DIR) libmon $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libmon_s.a libmon ; fi if [ $(SUF) = o ] ; then march $(SRC_DIR) libmon $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libmon_s.a libmon ; fi
head: $(SRC_DIR)/head_em.s head: $(SRC_DIR)/head_em.s
$(MACH) $(MACHFL) $(SRC_DIR)/head_em.s if [ $(SUF) = o ] ; then $(MACH) -c $(MACHFL) $(SRC_DIR)/head_em.s ; else cp $(SRC_DIR)/head_em.s head_em.s ; fi
mv head_em.$(SUF) head mv head_em.$(SUF) head
install: all install: all

3
mach/proto/libg/proto.liboc
View file

@ -6,6 +6,7 @@
MACHDEF= \ MACHDEF= \
"MACH=$(MACH)" \ "MACH=$(MACH)" \
"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
"SUF=$(SUF)" \ "SUF=$(SUF)" \
"ASAR=$(ASAR)" \ "ASAR=$(ASAR)" \
"RANLIB=$(RANLIB)" \ "RANLIB=$(RANLIB)" \
@ -13,7 +14,7 @@ MACHDEF= \
"TARGET_HOME=$(TARGET_HOME)" \ "TARGET_HOME=$(TARGET_HOME)" \
"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule" "COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile MAKEFILE=../../proto/libg/Makefile
LIBOC="PREF=ocm" "SRC=lang/occam/lib" LIBOC="PREF=ocm" "SRC=lang/occam/lib"
all: liboc all: liboc

3
mach/proto/libg/proto.libpc
View file

@ -6,6 +6,7 @@
MACHDEF= \ MACHDEF= \
"MACH=$(MACH)" \ "MACH=$(MACH)" \
"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
"SUF=$(SUF)" \ "SUF=$(SUF)" \
"ASAR=$(ASAR)" \ "ASAR=$(ASAR)" \
"RANLIB=$(RANLIB)" \ "RANLIB=$(RANLIB)" \
@ -13,7 +14,7 @@ MACHDEF= \
"TARGET_HOME=$(TARGET_HOME)" \ "TARGET_HOME=$(TARGET_HOME)" \
"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule" "COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile MAKEFILE=../../proto/libg/Makefile
LIBPC="PREF=pc" "SRC=lang/pc/libpc" LIBPC="PREF=pc" "SRC=lang/pc/libpc"
all: libpc all: libpc

7
mach/proto/libg/proto.libsys
View file

@ -12,11 +12,12 @@ libmon: $(SRC_DIR)/libmon_s.a
ASAR="$(ASAR)" ; export ASAR ; \ ASAR="$(ASAR)" ; export ASAR ; \
RANLIB="$(RANLIB)" ; export RANLIB ; \ RANLIB="$(RANLIB)" ; export RANLIB ; \
MACH="$(MACH)" ; export MACH ; \ MACH="$(MACH)" ; export MACH ; \
MACHFL="$(MACHFL)" ; export MACHFL ; \ SUF="$(SUF)" ; export SUF ; \
if [ $(SUF) = o ] march $(SRC_DIR) libmon $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libmon_s.a libmon ; fi MACHFL="$(MACHFL) -I$(SRC_DIR) -I$(TARGET_HOME)/h" ; export MACHFL ; \
if [ $(SUF) = o ] ; then march $(SRC_DIR) libmon $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libmon_s.a libmon ; fi
head: $(SRC_DIR)/head_em.s head: $(SRC_DIR)/head_em.s
$(MACH) $(MACHFL) $(SRC_DIR)/head_em.s if [ $(SUF) = o ] ; then $(MACH) -c $(MACHFL) -I$(SRC_DIR) -I$(TARGET_HOME)/h $(SRC_DIR)/head_em.s ; else cp $(SRC_DIR)/head_em.s head_em.s ; fi
mv head_em.$(SUF) head mv head_em.$(SUF) head
install: all install: all

8
mach/proto/libg/proto.make
View file

@ -25,21 +25,21 @@ headcp: head
rm -f head_$(PREF) rm -f head_$(PREF)
tailcp: tail tailcp: tail
cp tail_$(PREF) $(TARGET_HOME)/lib/$(MACH)/tail_$(PREF) cp tail_$(PREF)$(SUB) $(TARGET_HOME)/lib/$(MACH)/tail_$(PREF)$(SUB)
$(RANLIB) $(TARGET_HOME)/lib/$(MACH)/tail_$(PREF) $(RANLIB) $(TARGET_HOME)/lib/$(MACH)/tail_$(PREF)$(SUB)
rm -f tail_$(PREF)$(SUB) rm -f tail_$(PREF)$(SUB)
cp: headcp tailcp cp: headcp tailcp
head_$(PREF): $(HEADSRC) head_$(PREF): $(HEADSRC)
cp $(HEADSRC) head_$(PREF).e cp $(HEADSRC) head_$(PREF).e
$(MACH) $(MACHFL) -I$(TARGET_HOME)/h head_$(PREF).e $(MACH) $(MACHFL) -c -I$(TARGET_HOME)/h head_$(PREF).e
mv head_$(PREF).$(SUF) head_$(PREF) mv head_$(PREF).$(SUF) head_$(PREF)
-rm -f head_$(PREF).[ekm$(SUF)] -rm -f head_$(PREF).[ekm$(SUF)]
tail_$(PREF)$(SUB): tail_$(PREF)$(SUB):
@echo translation test @echo translation test
@$(MACH) $(MACHFL) $(SRC_HOME)/mach/proto/libg/barrier.c @$(MACH) $(MACHFL) -c $(SRC_HOME)/mach/proto/libg/barrier.c
@-rm -f barrier.[oeskm] barrier.so @-rm -f barrier.[oeskm] barrier.so
@echo OK @echo OK
-rm -f tail_$(PREF)$(SUB) -rm -f tail_$(PREF)$(SUB)

3
mach/proto/libg/proto.sysmon
View file

@ -6,6 +6,7 @@
MACHDEF= \ MACHDEF= \
"MACH=$(MACH)" \ "MACH=$(MACH)" \
"MACHFL=$(MACHFL) -I$(TARGET_HOME)/h" \
"SUF=$(SUF)" \ "SUF=$(SUF)" \
"ASAR=$(ASAR)" \ "ASAR=$(ASAR)" \
"RANLIB=$(RANLIB)" \ "RANLIB=$(RANLIB)" \
@ -13,7 +14,7 @@ MACHDEF= \
"TARGET_HOME=$(TARGET_HOME)" \ "TARGET_HOME=$(TARGET_HOME)" \
"COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule" "COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile MAKEFILE=../../proto/libg/Makefile
MON="PREF=mon" "SUB=" "SRC=lang/cem/libcc/mon" MON="PREF=mon" "SUB=" "SRC=lang/cem/libcc/mon"
all: mon all: mon