espresso: Enable multitarget for native projects and add 'sulong-bitcode' compiler as toolchain

Author: lewurm

espresso/mx.espresso/suite.py

@@ -248,18 +248,27 @@
                 "windows": {
                     "<others>": {
                         "cflags": ["-g", "-O3", "-Wall"],
+                        "multitarget": {
+                            "libc": ["default"],
+                        },
                     },
                 },
                 "linux-musl": {
                     "<others>": {
                         "cflags": ["-Wall", "-Werror", "-Wno-error=cpp"],
-                        "toolchain": "sulong:SULONG_BOOTSTRAP_TOOLCHAIN",
+                        "multitarget": {
+                            "libc": ["musl", "default"],
+                            "compiler": ["sulong-bitcode", "host", "*"]
+                        },
                     },
                 },
                 "<others>": {
                     "<others>": {
                         "cflags": ["-Wall", "-Werror"],
-                        "toolchain": "sulong:SULONG_BOOTSTRAP_TOOLCHAIN",
+                        "multitarget": {
+                            "libc": ["glibc", "musl", "default"],
+                            "compiler": ["sulong-bitcode", "host", "*"]
+                        },
                     },
                 },
             },
@@ -312,7 +321,9 @@
                             "-Wl,-current_version,1.0.0",
                             "-Wl,-compatibility_version,1.0.0"
                         ],
-                        "toolchain": "sulong:SULONG_BOOTSTRAP_TOOLCHAIN",
+                        "multitarget": {
+                            "compiler": ["sulong-bitcode", "host", "*"]
+                        },
                     },
                 },
                 "linux": {
@@ -322,7 +333,10 @@
                             "-Wl,-soname,libjvm.so",
                             "-Wl,--version-script,<path:espresso:com.oracle.truffle.espresso.mokapot>/mapfile-vers",
                         ],
-                        "toolchain": "sulong:SULONG_BOOTSTRAP_TOOLCHAIN",
+                        "multitarget": {
+                            "libc": ["glibc", "musl", "default"],
+                            "compiler": ["sulong-bitcode", "host", "*"]
+                        },
                     },
                 },
                 "linux-musl": {
@@ -332,12 +346,18 @@
                             "-Wl,-soname,libjvm.so",
                             "-Wl,--version-script,<path:espresso:com.oracle.truffle.espresso.mokapot>/mapfile-vers",
                         ],
-                        "toolchain": "sulong:SULONG_BOOTSTRAP_TOOLCHAIN",
+                        "multitarget": {
+                            "libc": ["musl", "default"],
+                            "compiler": ["sulong-bitcode", "host", "*"]
+                        },
                     },
                 },
                 "windows": {
                     "<others>": {
                         "cflags": ["-g", "-O3", "-Wall"],
+                        "multitarget": {
+                            "libc": ["default"],
+                        },
                     },
                 }
             },
@@ -558,7 +578,7 @@
                     "dependency:espresso:ESPRESSO_STANDALONE_COMMON/*",
                 ],
                 "<jdk_lib_dir>/truffle/": [
-                    "dependency:espresso:com.oracle.truffle.espresso.mokapot/<lib:jvm>",
+                    "dependency:espresso:com.oracle.truffle.espresso.mokapot/*/<multitarget_libc_selection>/<lib:jvm>",
                 ],
                 "lib/jvm.cfg": {
                     "source_type": "string",
@@ -621,7 +641,7 @@
                 ],
                 "languages/java/lib/": [
                     # Copy of libjvm.so, accessible by Sulong via the default Truffle file system.
-                    "dependency:espresso:com.oracle.truffle.espresso.mokapot/<lib:jvm>",
+                    "dependency:espresso:com.oracle.truffle.espresso.mokapot/*/<multitarget_libc_selection>/<lib:jvm>",
                 ],
                 "languages/java/": [
                     {
@@ -706,7 +726,7 @@
             "layout": {
                 "META-INF/resources/java/espresso-libs/<os>/<arch>/lib/": [
                     # Copy of libjvm.so, accessible by Sulong via the default Truffle file system.
-                    "dependency:espresso:com.oracle.truffle.espresso.mokapot/<lib:jvm>",
+                    "dependency:espresso:com.oracle.truffle.espresso.mokapot/*/<multitarget_libc_selection>/<lib:jvm>",
                 ],
                 "META-INF/resources/java/espresso-libs/<os>/<arch>/": "dependency:espresso:ESPRESSO_SUPPORT/*",
             },
@@ -751,7 +771,7 @@
             "platforms": "local",
             "layout": {
                 "lib/": [
-                    "dependency:espresso:com.oracle.truffle.espresso.native/<lib:nespresso>",
+                    "dependency:espresso:com.oracle.truffle.espresso.native/*/<multitarget_libc_selection>/<lib:nespresso>",
                     "dependency:espresso:ESPRESSO_POLYGLOT/*",
                     "dependency:espresso:HOTSWAP/*",
                     "dependency:espresso:CONTINUATIONS/*",
@@ -778,7 +798,7 @@
                 "./": "dependency:espresso:ESPRESSO_SUPPORT/*",
                 "lib/": [
                     # Copy of libjvm.so, accessible by Sulong via the default Truffle file system.
-                    "dependency:espresso:com.oracle.truffle.espresso.mokapot/<lib:jvm>",
+                    "dependency:espresso:com.oracle.truffle.espresso.mokapot/*/<multitarget_libc_selection>/<lib:jvm>",
                 ]
             },
             "maven": False,
@@ -790,7 +810,7 @@
             "platformDependent": True,
             "layout": {
                 "truffle/": [
-                    "dependency:espresso:com.oracle.truffle.espresso.mokapot/<lib:jvm>",
+                    "dependency:espresso:com.oracle.truffle.espresso.mokapot/*/<multitarget_libc_selection>/<lib:jvm>",
                 ],
             },
             "maven": False,

sulong/mx.sulong/suite.py

@@ -2259,6 +2259,66 @@
       "license": "BSD-new",
     },
 
+    "SULONG_NINJA_TOOLCHAIN": {
+      "native" : True,
+      "platformDependent" : True,
+      "native_toolchain": {
+        "kind": "ninja",
+        "compiler": "sulong-bitcode",
+        # empty, so it defaults everything to host properties
+        "target": {},
+      },
+
+      "os_arch": {
+        "windows": {
+          "<others>": {
+            "layout": {
+              "toolchain.ninja" : {
+                "source_type": "string",
+                "value": '''
+include <ninja-toolchain:MSVC_NINJA_TOOLCHAIN>
+CL=<path:SULONG_BOOTSTRAP_TOOLCHAIN>\\bin\\<cmd:clang-cl>
+LINK=<path:SULONG_BOOTSTRAP_TOOLCHAIN>\\bin\\<cmd:lld-link>
+LIB=<path:SULONG_BOOTSTRAP_TOOLCHAIN>\\bin\\<cmd:llvm-lib>
+ML=<path:SULONG_BOOTSTRAP_TOOLCHAIN>\\bin\\<cmd:llvm-ml>
+CFLAGS=
+CXXFLAGS=
+LDFLAGS=
+'''
+              },
+            },
+            "dependencies": [
+              "SULONG_BOOTSTRAP_TOOLCHAIN",
+              "mx:MSVC_NINJA_TOOLCHAIN",
+            ],
+          },
+        },
+        "<others>": {
+          "<others>": {
+            "layout": {
+              "toolchain.ninja" : {
+                "source_type": "string",
+                "value": '''
+include <ninja-toolchain:GCC_NINJA_TOOLCHAIN>
+CC=<path:SULONG_BOOTSTRAP_TOOLCHAIN>/bin/gcc
+CXX=<path:SULONG_BOOTSTRAP_TOOLCHAIN>/bin/g++
+AR=<path:SULONG_BOOTSTRAP_TOOLCHAIN>/bin/ar
+CFLAGS=
+CXXFLAGS=
+LDFLAGS=
+'''
+              },
+            },
+            "dependencies": [
+              "SULONG_BOOTSTRAP_TOOLCHAIN",
+              "mx:GCC_NINJA_TOOLCHAIN",
+            ],
+          },
+        },
+      },
+      "maven" : False,
+    },
+
     "SULONG_BOOTSTRAP_TOOLCHAIN_NO_HOME": {
       "description" : "Bootstrap toolchain without an llvm.home. Use for bootstrapping libraries that should be contained in llvm.home.",
       "native": True,