[skiplang] Update to LLVM 20. (#942)

Author: beauby

INSTALL.md

@@ -6,8 +6,8 @@
 
 You will need at least the following installed:
 
- * LLVM 15.
- * wasm-ld 15 (this is part of LLVM, but your distribution might split it into
+ * LLVM 20.
+ * wasm-ld 20 (this is part of LLVM, but your distribution might split it into
    a separate package: your wasm-ld version must match your LLVM version).
  * typescript 5.7 or later.
 

bin/apt-install.sh

@@ -3,7 +3,7 @@
 set -e
 
 default_steps=(skiplang-build-deps skipruntime-deps)
-LLVM_VERSION=15
+LLVM_VERSION=20
 PRIORITY=101
 
 usage() {

skiplang/compiler/bootstrap

@@ -173,15 +173,15 @@ fun runShell(args: Array<String>, verbose: Bool = false): void {
 }
 
 fun ensureCompatibleLLVMVersion(): void {
-  kLLVMVersion = "15.";
+  kLLVMVersion = "20.";
 
   p = System.subprocess(Array["llvm-config", "--version"]).fromSuccess();
   if (!p.success()) {
     print_error_raw(p.stderr);
     skipExit(1)
   } else if (!p.stdout.startsWith(kLLVMVersion)) {
     print_error(
-      `Incompatible llvm version ${p.stdout}, expected LLVM ${kLLVMVersion}`,
+      `Incompatible LLVM version ${p.stdout.trimRight()}, expected LLVM ${kLLVMVersion}`,
     );
     skipExit(1)
   }

skiplang/compiler/src/compile.sk

@@ -285,26 +285,6 @@ void sk_init(int pargc, char** pargv) {
   SKIP_destroy_Obstack(saved);
 }
 
-#ifdef SKIP_LIBRARY
-__attribute__((constructor)) static void lib_init() {
-  argc = 1;
-  char* argv0 = strdup("library");
-  argv = (char**)malloc(2 * sizeof(char*));
-  argv[0] = argv0;
-  argv[1] = NULL;
-  sk_init(argc, argv);
-}
-#else
-int main(int pargc, char** pargv) {
-  std::set_terminate(terminate);
-  // TODO: Make memory initialization read state.db path from the environment
-  // rather than command line arguments, and let the above constructor handle
-  // it.
-  sk_init(pargc, pargv);
-  skip_main();
-}
-#endif  // SKIP_LIBRARY
-
 static void print(FILE* descr, char* str) {
   size_t size = SKIP_String_byteSize((char*)str);
   fwrite(str, size, 1, descr);
@@ -638,3 +618,23 @@ void SKIP_js_delete_fun() {
   // Not implemented
 }
 }
+
+#ifdef SKIP_LIBRARY
+__attribute__((constructor)) static void lib_init() {
+  argc = 1;
+  char* argv0 = strdup("library");
+  argv = (char**)malloc(2 * sizeof(char*));
+  argv[0] = argv0;
+  argv[1] = NULL;
+  sk_init(argc, argv);
+}
+#else
+int main(int pargc, char** pargv) {
+  std::set_terminate(terminate);
+  // TODO: Make memory initialization read state.db path from the environment
+  // rather than command line arguments, and let the above constructor handle
+  // it.
+  sk_init(pargc, pargv);
+  skip_main();
+}
+#endif  // SKIP_LIBRARY