Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00
Code Activity

Merge pull request #1415 from disarray2077/llvm1301

Browse source 
Fixes to upgrade LLVM version to 13.0.1
This commit is contained in:
Brian Fiete 2022-02-08 11:40:05 -08:00 • committed by GitHub
commit 2ab072ee20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 193 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

4
IDE/src/BuildContext.bf
View file

@ -630,7 +630,7 @@ namespace IDE
compilerExePath.Append(@"/upstream/emscripten/emcc.bat");
//linkLine.Append(" c:\\Beef\\wasm\\BeefRT.a -s STRICT=1 -s USE_PTHREADS=1 -s ALIASING_FUNCTION_POINTERS=1 -s ASSERTIONS=0 -s DISABLE_EXCEPTION_CATCHING=0 -s DEMANGLE_SUPPORT=0 -s EVAL_CTORS=1 -s WASM=1 -s \"EXPORTED_FUNCTIONS=['_BeefMain','_BeefDone','_pthread_mutexattr_init','_pthread_mutex_init','_emscripten_futex_wake','_calloc','_sbrk']\"");
linkLine.Append(" ", gApp.mInstallDir);
linkLine.Append("..\\..\\wasm\\BeefRT.a -s STRICT=1 -s USE_PTHREADS=1 -s ALIASING_FUNCTION_POINTERS=1 -s ASSERTIONS=0 -s DISABLE_EXCEPTION_CATCHING=0 -s DEMANGLE_SUPPORT=0 -s EVAL_CTORS=1 -s WASM=1");
linkLine.Append("..\\..\\wasm\\BeefRT.a -s STRICT=1 -s USE_PTHREADS=1 -s ASSERTIONS=0 -s DISABLE_EXCEPTION_CATCHING=0 -s DEMANGLE_SUPPORT=0 -s WASM=1");
String workingDir = scope String();
if (!llvmDir.IsEmpty)
@ -642,6 +642,8 @@ namespace IDE
workingDir.Append(gApp.mInstallDir);
}
linkLine.Replace('\\', '/');
//linkLine.Append(" --no-entry --export-all");
var runCmd = gApp.QueueRun(compilerExePath, linkLine, workingDir, .UTF8);

8
IDE/src/IDEApp.bf
View file

@ -8004,7 +8004,7 @@ namespace IDE
}
}*/
const int cArgFileThreshold = 0x7800;
const int cArgFileThreshold = 0x2000 - 1;
public ExecutionQueueCmd QueueRun(String fileName, String args, String workingDir, ArgsFileKind argsFileKind = .None)
{
@ -8012,7 +8012,7 @@ namespace IDE
executionQueueCmd.mFileName = new String(fileName);
executionQueueCmd.mArgs = new String(args);
executionQueueCmd.mWorkingDir = new String(workingDir);
if (args.Length > cArgFileThreshold)
if (fileName.Length + args.Length + 1 > cArgFileThreshold)
{
// Only use UTF16 if we absolutely need to
if ((argsFileKind == .UTF16WithBom) && (!args.HasMultibyteChars()))
@ -9662,10 +9662,10 @@ namespace IDE
case .Linux:
newString.AppendF("./{} -lpthread -ldl -Wl,-rpath -Wl,$ORIGIN", rtName);
case .Wasm:
newString.Append(mInstallDir);
/*newString.Append(mInstallDir);
newString.Append("Beef", IDEApp.sRTVersionStr, "RT");
newString.Append((Workspace.PlatformType.GetPtrSizeByName(gApp.mPlatformName) == 4) ? "32" : "64");
newString.Append("_wasm.lib");
newString.Append("_wasm.lib");*/
default:
}