From 8dda1fe2a811104c7355269a19df28a1a2ed616e Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Tue, 24 Nov 2020 17:43:04 -0800
Subject: [PATCH] Update build files for M1 Mac systems (refs
 Interlisp/medley#69)

       The config.guess script returns "aarch64-apple-darwin20.1.0" for an M1 Big Sur mac mini.

	modified:   bin/machinetype
	new file:   bin/makefile-darwin.aarch64-x
---
 bin/machinetype               |  1 +
 bin/makefile-darwin.aarch64-x | 53 +++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 bin/makefile-darwin.aarch64-x

diff --git a/bin/machinetype b/bin/machinetype
index 102139a..5577b50 100755
--- a/bin/machinetype
+++ b/bin/machinetype
@@ -16,6 +16,7 @@ case "$os" in
         alpha-*)	      echo alpha ;;
 	i*86-*-*)             echo 386 ;;
 	armv7l-*-*)	      echo armv7l ;;
+	aarch64-*-*)	      echo aarch64 ;;
         x86_64-apple-darwin15*) echo 386 ;;
 	x86_64-*)	      echo x86_64 ;;
         powerpc-*)	      echo ppc ;;
diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x
new file mode 100644
index 0000000..d753ecd
--- /dev/null
+++ b/bin/makefile-darwin.aarch64-x
@@ -0,0 +1,53 @@
+# Options for MacOS, x86 processor, X windows
+
+CC = clang -std=gnu89 -funsigned-char -fno-strict-aliasing
+OEXT=.o
+
+XFILES = $(OBJECTDIR)xmkicon.o \
+	$(OBJECTDIR)xbbt.o \
+	$(OBJECTDIR)dspif.o \
+	$(OBJECTDIR)xinit.o \
+	$(OBJECTDIR)xscroll.o \
+	$(OBJECTDIR)xcursor.o \
+	$(OBJECTDIR)xlspwin.o \
+	$(OBJECTDIR)xrdopt.o \
+	$(OBJECTDIR)xwinman.o
+
+
+XVERSION = XV11R4
+XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT -D$(XVERSION) # $(CLXFLAGS)
+
+# OPTFLAGS is normally -O2.
+OPTFLAGS =  -O1 -g
+DISPOPTFLAGS = -O1 -g
+FPFLAGS =
+DEBUGFLAGS = # -DDEBUG -DOPTRACE
+DFLAGS = $(DEBUGFLAGS) -DFSERROR -DNEW_STORAGE -DMACOSX -DOLD_CURSOR -DUSETERMIOS \
+	-DBYTESWAP -DFORKCOMM -DNOFORN -DLOGINT  $(XFLAGS) \
+	-DRELEASE=351
+
+LDFLAGS = -L/usr/X11/lib -lX11 -lm
+LDELDFLAGS =  -L/usr/X11/lib -lX11 -lm
+
+INLINE = # $(SRCDIR)dspSPARC.il
+BITBLTFILE = # $(OBJECTDIR)bbtSPARC.o
+BYTESWAPFILES = $(OBJECTDIR)byteswap.o
+
+OBJECTDIR = ../$(RELEASENAME)/
+
+default	: ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex
+
+############
+#
+#      Normal compilation for xc.o without optimized dispatch loop hacks
+#
+############
+$(OBJECTDIR)xc.o:      $(SRCDIR)xc.c $(INCDIR)lispemul.h  $(INCDIR)emlglob.h \
+	$(INCDIR)address.h \
+	$(INCDIR)adr68k.h  $(INCDIR)stack.h  $(INCDIR)lspglob.h \
+	$(INCDIR)lsptypes.h  $(INCDIR)lispmap.h  $(INCDIR)cell.h \
+	$(INCDIR)initatms.h  $(INCDIR)gcdata.h  \
+	$(INCDIR)arith.h $(INCDIR)stream.h \
+	$(INCDIR)tos1defs.h  $(INCDIR)tosret.h \
+	$(INCDIR)tosfns.h  $(INCDIR)inlineC.h
+	$(CC) $(DISPRFLAGS) -UOPDISP  $(SRCDIR)xc.c -I$(INCDIR) -o $(OBJECTDIR)xc.o