From 57396b9abb263d2cfc2c2a23ca239c7ccf213cd7 Mon Sep 17 00:00:00 2001
From: Brian Fiete <bfiete@gmail.com>
Date: Wed, 16 Oct 2019 16:23:19 -0700
Subject: [PATCH] Auto stash before merge of "master" and "origin/master"

---
 .DS_Store                                 | Bin 14340 -> 16388 bytes
 BeefySysLib/third_party/libffi/install-sh |   0
 IDE/src/Workspace.bf                      |   2 +-
 IDEHelper/CMakeLists.txt                  |  34 ++++++++++++++--------
 extern/.DS_Store                          | Bin 6148 -> 8196 bytes
 5 files changed, 23 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 BeefySysLib/third_party/libffi/install-sh

diff --git a/.DS_Store b/.DS_Store
index 288a0d76440c670d286ec93540a37715c3711b66..ce4492a6ea4d2b015b3d585e4f9fb02bf52bdca7 100644
GIT binary patch
literal 16388
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
Tu-AWk{ZCri#g%h%t^fZ53gT~A

delta 1147
zcmZ`(TWlLe6ul?5>)DO%Y~rSlvp7!TNAs}bB@KBLQ}SqN)3oFRmo}x8I@wLSkT_{<
zQeGkyr4>{NluoOD(1=h)0;v)eSd|bzMZAhcc?k<D1Qm!sev0@(5rQ(C1*t!bG;`<P
zGxyHSIip#84vVu<B0~S;`kh3Ym@?5Vt9Zn4lBnLYv=nWvt`pWF03w4X=t+7&^!(D%
z2-nh17X;|!(}`N{O?rH{M6=RFwSF>+$7=@MMK^OYRPkW4ncqly`ITgtPqeM_cTx%N
zFRS5CD~o&}zLT%ED?F^R+H+&GQ)a%PY1dKaaJn|QnIxC1L%W7$ezSRid$(-lkG6z|
zFM6s&jqz6PuC4cOFL`|xN@bNSA24+zS1>0`V{Y#;Q!gAD&F06AoNneO_syGmb8O1U
z<g(L7CC*Ax$-5~~6RcHLeyS?Ip!h1ha#(GUl*{a(o-G)AW^}8NUa}B1ti~97$chil
z8Dg}<a+BI3DOr}un@<_*3+1Gol9arZdCbiHo7ygSFh!U4PG!f8DZ5&i+{2V%Y2Umt
zmp5l}A~+=WNXy$;B@)v9@tNsqagV&cxKABm%BSp*wfXLBzA!Rt<i!5g=?BBAI%>uH
zbluPyW0Bq_zS3H=5TrKhrJZz8NH#0vdWl}9SLjt*rAu^~uFzGwMqkob^fi4?KhdxB
zJN-$2(cg3n3=+!WK@g3IAPNmV*orjnK|hAE8~0-b89a<bIE*YNF^i+fqkv~{0w?hz
zPJ!cmH<s}lR&WXL;sbn$kMJ?Rz&H3|{cTX0^=PcN$2R|s_>sTfuDL>k_wBe{?D{H?
zEwF!MbzP(>+1{1z<L6sOn5~~2;>*?X1<MK7heC=)7Ask9G$!0KA*k&(w}fQHA>@+Q
z(YBNvQd~kA8{N_&%ZgJ-XQSOc0^J})Vx?f9W|O>4?v<=(qtJS?6bs2rviP<SpW$z`
zR{js|7w96rN1xDVg6?nW2K_?6(VC#zg$e`&(RUz(I&4NWT9H5!o#+;n-z`WV#10H$
zmmofa2eBWcIDl~&g7zaYF(+uB$1yyC<9Obp--j2lgwsNSGeUq1e63@W|Iz8^*E_@f
zTvvjp6s`DHV9kwkzF0rb-)`{p(+y!h6!Gy#8a2K-(#U^~B>2^+pT8Lm^W|8e_-rhO
z;^*-dSMj^RHFwZu-&QLZcJTJUqFCv?>EIRVq-1IPzO{^}Jt`}+KbCHOIDNL5YIZyR
E0ps-wJOBUy

diff --git a/BeefySysLib/third_party/libffi/install-sh b/BeefySysLib/third_party/libffi/install-sh
old mode 100644
new mode 100755
diff --git a/IDE/src/Workspace.bf b/IDE/src/Workspace.bf
index 2507d5d5..3b9e37cb 100644
--- a/IDE/src/Workspace.bf
+++ b/IDE/src/Workspace.bf
@@ -80,7 +80,7 @@ namespace IDE
 				case "macOS":
 					outTriple.Append("x86_64-apple-macosx10.14.0");
 				case "iOS":
-					outTriple.Append("arm64-apple-ios13.1");
+					outTriple.Append("aarch64-apple-ios");
 				default:
 					return false;
 				}
diff --git a/IDEHelper/CMakeLists.txt b/IDEHelper/CMakeLists.txt
index db011e1e..4d6758e8 100644
--- a/IDEHelper/CMakeLists.txt
+++ b/IDEHelper/CMakeLists.txt
@@ -70,6 +70,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
   include_directories(
     ../extern/llvm_linux_8_0_0/include
     ../extern/llvm_linux_8_0_0/lib/Target/X86
+    ../extern/llvm_linux_8_0_0/lib/Target/AArch64
   )
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}")
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_DEBUG}")
@@ -79,6 +80,7 @@ else()
   include_directories(
     ../extern/llvm_linux_rel_8_0_0/include
     ../extern/llvm_linux_rel_8_0_0/lib/Target/X86
+    ../extern/llvm_linux_rel_8_0_0/lib/Target/AArch64
   )
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}")
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${OUTPUT_RELEASE}")
@@ -177,7 +179,14 @@ add_library(${PROJECT_NAME} SHARED
 )
 
 if (${APPLE})
-    set(TARGET_LIBS_OS "ncurses")
+    set(TARGET_LIBS_OS "ncurses \
+      ${LLVM_LIB}/libLLVMAArch64Info.a \
+      ${LLVM_LIB}/libLLVMAArch64Utils.a \
+      ${LLVM_LIB}/libLLVMAArch64AsmPrinter.a \
+      ${LLVM_LIB}/libLLVMAArch64Desc.a \
+      ${LLVM_LIB}/libLLVMAArch64CodeGen.a \
+      ${LLVM_LIB}/libLLVMAArch64AsmParser.a \
+      ${LLVM_LIB}/libLLVMAArch64Disassembler.a")
 else()
     set(TARGET_LIBS_OS "backtrace")
 endif()
@@ -190,26 +199,19 @@ else()
     ${LLVM_LIB}/libLLVMCore.a
     ${LLVM_LIB}/libLLVMMC.a
     ${LLVM_LIB}/libLLVMMCParser.a
-    ${LLVM_LIB}/libLLVMCodeGen.a
-    ${LLVM_LIB}/libLLVMX86Disassembler.a
+    ${LLVM_LIB}/libLLVMCodeGen.a    
     ${LLVM_LIB}/libLLVMMCDisassembler.a
-    ${LLVM_LIB}/libLLVMSupport.a
-    ${LLVM_LIB}/libLLVMX86Info.a
-    ${LLVM_LIB}/libLLVMX86Utils.a
-    ${LLVM_LIB}/libLLVMX86AsmPrinter.a
-    ${LLVM_LIB}/libLLVMX86Desc.a    
+    ${LLVM_LIB}/libLLVMSupport.a    
     ${LLVM_LIB}/libLLVMObject.a
     ${LLVM_LIB}/libLLVMBitReader.a
     ${LLVM_LIB}/libLLVMAsmParser.a    
-    ${LLVM_LIB}/libLLVMTarget.a
-    ${LLVM_LIB}/libLLVMX86CodeGen.a
+    ${LLVM_LIB}/libLLVMTarget.a    
     ${LLVM_LIB}/libLLVMScalarOpts.a
     ${LLVM_LIB}/libLLVMInstCombine.a
     ${LLVM_LIB}/libLLVMSelectionDAG.a
     ${LLVM_LIB}/libLLVMProfileData.a
     ${LLVM_LIB}/libLLVMTransformUtils.a
-    ${LLVM_LIB}/libLLVMAnalysis.a
-    ${LLVM_LIB}/libLLVMX86AsmParser.a
+    ${LLVM_LIB}/libLLVMAnalysis.a    
     ${LLVM_LIB}/libLLVMAsmPrinter.a
     ${LLVM_LIB}/libLLVMBitWriter.a
     ${LLVM_LIB}/libLLVMVectorize.a
@@ -225,5 +227,13 @@ else()
     ${LLVM_LIB}/libLLVMLinker.a
     ${LLVM_LIB}/libLLVMDemangle.a
     ${LLVM_LIB}/libLLVMAggressiveInstCombine.a
+
+    ${LLVM_LIB}/libLLVMX86Info.a
+    ${LLVM_LIB}/libLLVMX86Utils.a
+    ${LLVM_LIB}/libLLVMX86AsmPrinter.a
+    ${LLVM_LIB}/libLLVMX86Desc.a    
+    ${LLVM_LIB}/libLLVMX86CodeGen.a
+    ${LLVM_LIB}/libLLVMX86AsmParser.a
+    ${LLVM_LIB}/libLLVMX86Disassembler.a
   )
 endif()
diff --git a/extern/.DS_Store b/extern/.DS_Store
index 8cb383c57b175c20eedebbb20fa9ab33c7a2ce99..1beb90a06b4b0a3df6878c5f21dbc6888ffade25 100644
GIT binary patch
literal 8196
zcmeHM%Zd|06g}l+5tNZ2f-?l65d=4ivs2u(LtF?V$ZTAQ6VuU&(mfrLjJmTovrzm1
zzre>|=uarPa_2_DA8_>CsxniiJ0#=62;PFK(_M8>-KtYvUAY|qW__o-2CM+6GYdA3
zu&7AVF1eHr`5GY`@^LlIlTMm<c;6^lYlSMH3aA3AfGVI0{0j>3%$8K2a_+lUEmZ+k
z;J;Kr-VYJ8VC=DQXkQ&HYzRQCvDzkH+n@f#NGgc2$HF0Nn2e(m9o6^{!}!R-I6B*7
zZ(lfcbQtTI{dmvDM<~Vz9wxHpFtI}|RRL9?tboMsH6+-<0O>^heu-^oe%NG*b@XVr
zjUoEDi?n3_W|n=rwYHJuS>N_{^6NEXsn0BLwfr}P`sux=k8Ztwce&cGJC|L*7x+BY
z7T3pQ?0AR_XE~Dray;OC5{$5k3(V&wcZW&Z$@5eQN5_OsbSS}n-gj}1*LN`bT{Lro
z_MvFYQ@BI)CYZYu%tpXW>2sT&A5R<NOyfZNrEkq<o6cr(!nJ5FZ+*G#)?yCc{@NUb
z7pzrn^{{<Rj!zL`V4uK>^^)^pZc-o$uD`tb<RIKoocGVaU%cnUncH`k?~C*&{6H++
zc=eV;=SCj!Va_Ty=8Iq>kL|+w10VLnKEnBZ{QT_KMjUg)@mIBn;{!ec1$*atE(@gR
zzZF3XRbYV%EIHpR68~S}aiHG;7PuJdS`}E30;bm5Xsy$^JDSU*kXSonZZk^~yTYNR
lu(07c(T3y1@gIh~j%X^J*kj?4HB9;;z{;S7D)3ho_z5RU8r1**

delta 125
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGjUEV6q~50$jG)aU^gQp+hiVr=*j;DbQu{Z
z>k3v*z9Fo!vFswtVs;J=L1v(GAQ0dN60RVf8w<ZPPv)0#1R2f1$iTn?qM0COgT*$-
I^UPre0HZb(>i_@%