2b15d05
--- gcl/ansi-tests/makefile.orig	2020-01-31 11:48:02.683686167 -0700
2b15d05
+++ gcl/ansi-tests/makefile	2020-01-31 12:05:44.248925933 -0700
d60bed4
@@ -1,10 +1,10 @@
d60bed4
 -include ../makedefs
d60bed4
 
d60bed4
 test-unixport:
d60bed4
-	echo "(load \"gclload.lsp\")" | ../unixport/saved_ansi_gcl$(EXE) | tee test.out
d60bed4
+	echo "(load \"gclload.lsp\")" | setarch -R ../unixport/saved_ansi_gcl$(EXE) | tee test.out
d60bed4
 
d60bed4
 test:
d60bed4
-	echo "(load \"gclload.lsp\")" | gcl | tee test.out
d60bed4
+	echo "(load \"gclload.lsp\")" | setarch -R gcl | tee test.out
d60bed4
 
d60bed4
 clean:
d60bed4
 	rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl
2b15d05
--- gcl/clcs/makefile.orig	2014-10-23 15:29:00.000000000 -0600
2b15d05
+++ gcl/clcs/makefile	2019-05-05 15:28:33.007845535 -0600
d60bed4
@@ -8,11 +8,11 @@ FILES:=$(shell ls -1 gcl_clcs_*.lisp | s
d60bed4
 all: $(addsuffix .c,$(FILES)) $(addsuffix .o,$(FILES))
d60bed4
 
d60bed4
 saved_clcs_gcl: ../unixport/saved_pcl_gcl$(EXE)
d60bed4
-	echo '(load "package.lisp")(load "myload.lisp")(si::save-system "$@")' | $< $(
d60bed4
+	echo '(load "package.lisp")(load "myload.lisp")(si::save-system "$@")' | setarch -R $< $(
d60bed4
 
d60bed4
 %.h %.data %.c : %.lisp saved_clcs_gcl
d60bed4
 	cp ../h/cmpinclude.h .
d60bed4
-	$(COMPILE_FILE) $<
d60bed4
+	setarch -R $(COMPILE_FILE) $<
d60bed4
 
d60bed4
 %.o: %.c %.h %.data
d60bed4
 	$(CC) $(CFLAGS) -c $< -o $@
d60bed4
@@ -27,10 +27,10 @@ sys-proclaim.lisp: $(addsuffix .fn,$(FIL
d60bed4
 	'(compiler::make-all-proclaims "*.fn")' | ../xbin/gcl
d60bed4
 
d60bed4
 compile: ${LISP}
d60bed4
-	echo '(load "package.lisp")(load "loading.lisp")(jamie-load-clcs :compile)' | ${LISP}
d60bed4
+	echo '(load "package.lisp")(load "loading.lisp")(jamie-load-clcs :compile)' | setarch -R ${LISP}
d60bed4
 
d60bed4
 saved_full_gcl: ${LISP}
d60bed4
-	echo '(load "package.lisp")(load "loading.lisp")(jamie-load-clcs :compiled)(system::save-system "saved_full_gcl")' | ${LISP}
d60bed4
+	echo '(load "package.lisp")(load "loading.lisp")(jamie-load-clcs :compiled)(system::save-system "saved_full_gcl")' | setarch -R ${LISP}
d60bed4
 
d60bed4
 clean:
d60bed4
 	rm -f *.o *.fn saved_full_gcl$(EXE) saved_full_gcl cmpinclude.h *.c *.h *.data saved_clcs_gcl$(EXE)
2b15d05
--- gcl/cmpnew/makefile.orig	2014-10-23 15:29:00.000000000 -0600
2b15d05
+++ gcl/cmpnew/makefile	2019-05-05 15:37:17.021442257 -0600
d60bed4
@@ -19,7 +19,7 @@ LISP=$(PORTDIR)/saved_pre_gcl$(EXE)
d60bed4
 COMPILE_FILE=$(LISP) $(PORTDIR) -system-p -c-file -data-file -h-file -compile
d60bed4
 
d60bed4
 %.o: $(PORTDIR)/saved_pre_gcl$(EXE) %.lsp
d60bed4
-	$(COMPILE_FILE) $*
d60bed4
+	setarch -R $(COMPILE_FILE) $*
d60bed4
 
d60bed4
 all:	$(OBJS)
d60bed4
 
d60bed4
@@ -32,16 +32,16 @@ fns:	../cmpnew/gcl_collectfn.o
d60bed4
 	$(MAKE) fns1 -e "FNS=`echo ${OBJS} | sed -e 's:\.o:\.fn:g'`"
d60bed4
 
d60bed4
 gcl_collectfn.o:
d60bed4
-	$(PORTDIR)/saved_pre_gcl$(EXE) $(PORTDIR)/ -compile $*.lsp
d60bed4
+	setarch -R $(PORTDIR)/saved_pre_gcl$(EXE) $(PORTDIR)/ -compile $*.lsp
d60bed4
 
d60bed4
 .lisp.o:
d60bed4
 	@ ../xbin/if-exists $(PORTDIR)/saved_pre_gcl$(EXE) \
d60bed4
-	"$(PORTDIR)/saved_pre_gcl$(EXE) $(PORTDIR)/ -compile $*.lisp " 
d60bed4
+	"setarch -R $(PORTDIR)/saved_pre_gcl$(EXE) $(PORTDIR)/ -compile $*.lisp " 
d60bed4
 
d60bed4
 sys-proclaim.lisp: fns
d60bed4
 	echo '(in-package "COMPILER")' \
d60bed4
 	'(load "../cmpnew/gcl_collectfn")(load "../lsp/sys-proclaim.lisp")'\
d60bed4
-	'(compiler::make-all-proclaims "*.fn")' | ../xbin/gcl
d60bed4
+	'(compiler::make-all-proclaims "*.fn")' | setarch -R ../xbin/gcl
d60bed4
 
d60bed4
 
d60bed4
 newfn:	
2b15d05
--- gcl/comp/makefile.orig	2014-10-23 15:29:00.000000000 -0600
2b15d05
+++ gcl/comp/makefile	2019-05-05 15:03:48.701750576 -0600
d60bed4
@@ -4,16 +4,16 @@ LISP=../unixport/saved_kcl
d60bed4
 LOAD='(load "sysdef.lsp")(make::make :bcomp :compile t)'
d60bed4
 
d60bed4
 all:
d60bed4
-	echo ${LOAD} | ${LISP}
d60bed4
+	echo ${LOAD} | setarch -R ${LISP}
d60bed4
 
d60bed4
 
d60bed4
 tests:
d60bed4
 	echo ${LOAD}'(load "try1")(load "../tests/all-tests.lsp")(in-package "BCOMP")(do-some-tests)' \
d60bed4
-	'(test-sloop)' | ${LISP}
d60bed4
+	'(test-sloop)' | setarch -R ${LISP}
d60bed4
 
d60bed4
 
d60bed4
 test1:
d60bed4
-	echo '(load "../tests/try-comp")' | ${LISP}
d60bed4
+	echo '(load "../tests/try-comp")' | setarch -R ${LISP}
d60bed4
 
d60bed4
 
d60bed4
 TFILES=src/makefile comp/makefile unixport/makefile o/makefile \
2b15d05
--- gcl/gcl-tk/makefile.orig	2020-01-31 11:51:46.178093096 -0700
2b15d05
+++ gcl/gcl-tk/makefile	2020-01-31 12:05:44.249925917 -0700
d60bed4
@@ -22,13 +22,13 @@ CFLAGS1=$(CFLAGS) -I../o -I../h ${TK_INC
d60bed4
 
d60bed4
 all: gcltksrv   tkl.o tinfo.o  demos/gc-monitor.o gcltkaux
d60bed4
 	(cd demos ; \
d60bed4
-	echo '(load "../tkl.o")(TK::GET-AUTOLOADS (directory "*.lisp"))' | ../../unixport/$(FLISP)) 
d60bed4
+	echo '(load "../tkl.o")(TK::GET-AUTOLOADS (directory "*.lisp"))' | setarch -R ../../unixport/$(FLISP)) 
d60bed4
 
d60bed4
 .lisp.o:
d60bed4
-	echo "(compile-file \"$*.lisp\" :c-file nil :c-debug nil)" | ../unixport/$(FLISP)
d60bed4
+	echo "(compile-file \"$*.lisp\" :c-file nil :c-debug nil)" | setarch -R ../unixport/$(FLISP)
d60bed4
 
d60bed4
 .lsp.o:
d60bed4
-	echo "(compile-file \"$*.lsp\" :c-file nil :c-debug nil)" | ../unixport/$(FLISP)
d60bed4
+	echo "(compile-file \"$*.lsp\" :c-file nil :c-debug nil)" | setarch -R ../unixport/$(FLISP)
d60bed4
 
d60bed4
 
d60bed4
 
2b15d05
--- gcl/lsp/makefile.orig	2020-01-31 11:47:58.376755408 -0700
2b15d05
+++ gcl/lsp/makefile	2020-01-31 12:05:44.250925901 -0700
d60bed4
@@ -25,7 +25,7 @@ LISP=$(PORTDIR)/saved_pre_gcl$(EXE)
d60bed4
 COMPILE_FILE=$(LISP) $(PORTDIR) -system-p -c-file -data-file -h-file -compile
d60bed4
 
d60bed4
 %.o: $(PORTDIR)/saved_pre_gcl$(EXE) %.lsp
d60bed4
-	$(COMPILE_FILE) $*
d60bed4
+	setarch -R $(COMPILE_FILE) $*
d60bed4
 
d60bed4
 all:	$(OBJS) #$(RL_OBJS)
d60bed4
 
2b15d05
--- gcl/makefile.orig	2020-01-31 11:51:56.643924841 -0700
2b15d05
+++ gcl/makefile	2020-01-31 12:05:44.250925901 -0700
d60bed4
@@ -198,7 +198,7 @@ install1:
d60bed4
 	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
d60bed4
 	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
d60bed4
 		mv $(FLISP)$(EXE) temp$(EXE) && \
d60bed4
-		echo '(si::reset-sys-paths "$(INSTALL_LIB_DIR)/")(si::save-system "$(FLISP)$(EXE)")' | ./temp$(EXE) && \
d60bed4
+		echo '(si::reset-sys-paths "$(INSTALL_LIB_DIR)/")(si::save-system "$(FLISP)$(EXE)")' | setarch -R ./temp$(EXE) && \
d60bed4
 		rm -f temp$(EXE)
d60bed4
 	if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
d60bed4
 #	ln $(SYMB) $(INSTALL_LIB_DIR)/$(PORTDIR)/$(FLISP)$(EXE) \
2b15d05
--- gcl/pcl/makefile.orig	2020-01-31 11:46:11.179480664 -0700
2b15d05
+++ gcl/pcl/makefile	2020-01-31 12:05:44.250925901 -0700
d60bed4
@@ -24,15 +24,15 @@ all: $(addsuffix .c,$(AFILES)) $(addsuff
d60bed4
 
d60bed4
 saved_gcl_pcl: ../unixport/saved_gcl$(EXE)
d60bed4
 	cp ../h/cmpinclude.h .
d60bed4
-	echo $(SETUP) '(pcl::compile-pcl)' | $< 
d60bed4
-	echo $(SETUP) '(pcl::load-pcl)(si::save-system "$@")' | $<
d60bed4
+	echo $(SETUP) '(pcl::compile-pcl)' | setarch -R $< 
d60bed4
+	echo $(SETUP) '(pcl::load-pcl)(si::save-system "$@")' | setarch -R $<
d60bed4
 
d60bed4
 $(addsuffix .c,$(AFILES)) $(addsuffix .data,$(AFILES))\
d60bed4
 	$(addsuffix .h,$(AFILES)) $(addsuffix .lsp,$(GFILES)): \
d60bed4
 	$(addsuffix .lisp,$(subst gcl_pcl_impl_low,impl/gcl/gcl_pcl_impl_low,$(FILES)))
d60bed4
 	rm -f *.o *gazonk*
d60bed4
 	cp ../h/cmpinclude.h .
d60bed4
-	echo ${SETUP} '(pcl::compile-pcl)' | ../unixport/saved_gcl$(EXE)
d60bed4
+	echo ${SETUP} '(pcl::compile-pcl)' | setarch -R ../unixport/saved_gcl$(EXE)
d60bed4
 	for i in gazonk* ; do \
d60bed4
 		j=$$(echo $$i | sed 's,\..*$$,,1');k="gazonk$$(echo $$j | cut -f3 -d\_)";\
d60bed4
 		l=$$(echo $$i | sed 's,^.*\.,,1');\
d60bed4
@@ -57,10 +57,10 @@ remake-sys-files:
d60bed4
 	rm -f *.o *gazonk*
d60bed4
 	cp ../h/cmpinclude.h .
d60bed4
 	echo ${SETUP} '(load "../cmpnew/gcl_collectfn.lsp")(compiler::emit-fn t)' \
d60bed4
-		'(pcl::compile-pcl)' | ../unixport/saved_gcl$(EXE) ../unixport/
d60bed4
+		'(pcl::compile-pcl)' | setarch -R ../unixport/saved_gcl$(EXE) ../unixport/
d60bed4
 	echo ${SETUP} '(load "../cmpnew/gcl_collectfn.lsp") '\
d60bed4
 		'(pcl::load-pcl)(in-package "PCL")(renew-sys-files)' | \
d60bed4
-		../unixport/saved_gcl$(EXE) ../unixport/
d60bed4
+		setarch -R ../unixport/saved_gcl$(EXE) ../unixport/
d60bed4
 	cp sys-proclaim.lisp xxx
d60bed4
 	cat xxx | sed -e "s/COMPILER::CMP-ANON//g" > sys-proclaim.lisp
d60bed4
 	rm xxx
2b15d05
--- gcl/xgcl-2/makefile.orig	2020-01-31 11:46:00.464653275 -0700
2b15d05
+++ gcl/xgcl-2/makefile	2020-01-31 12:05:44.250925901 -0700
d60bed4
@@ -4,13 +4,13 @@
d60bed4
 all: objects #docs
d60bed4
 
d60bed4
 objects: $(LISP)
d60bed4
-	echo '(load "sysdef.lisp")(load "sys-proclaim.lisp")(xlib::compile-xgcl)' | $(LISP)
d60bed4
+	echo '(load "sysdef.lisp")(load "sys-proclaim.lisp")(xlib::compile-xgcl)' | setarch -R $(LISP)
d60bed4
 
d60bed4
 saved_xgcl: $(LISP)
d60bed4
-	echo '(load "sysdef.lisp")(load "sys-proclaim.lisp")(xlib::compile-xgcl)(xlib::save-xgcl "$@")' | $(LISP)
d60bed4
+	echo '(load "sysdef.lisp")(load "sys-proclaim.lisp")(xlib::compile-xgcl)(xlib::save-xgcl "$@")' | setarch -R $(LISP)
d60bed4
 
d60bed4
 sys-proclaim.lisp:
d60bed4
-	echo '(load "sysdef.lisp")(compiler::emit-fn t)(xlib::compile-xgcl)(compiler::make-all-proclaims "*.fn")' | $(LISP)
d60bed4
+	echo '(load "sysdef.lisp")(compiler::emit-fn t)(xlib::compile-xgcl)(compiler::make-all-proclaims "*.fn")' | setarch -R $(LISP)
d60bed4
 
d60bed4
 docs: dwdoc/dwdoccontents.html dwdoc.pdf
d60bed4