Rename the sulong mx substitution to sulong_prefix to avoid potential name clashes

Author: eregon

Diff for: sulong/mx.sulong/mx_sulong.py

@@ -94,13 +94,13 @@ def _lib_versioned(arg):
 
 mx_subst.results_substitutions.register_with_arg('libv', _lib_versioned)
 
-def prefix_path(name):
+def sulong_prefix_path(name):
     # name is a CMakeNinjaProject with `symlinkSource: True`
     # return the path to the build directory, that also includes the sources
     p = mx.project(name)
     return p.out_dir
 
-mx_subst.results_substitutions.register_with_arg('prefix', prefix_path)
+mx_subst.results_substitutions.register_with_arg('sulong_prefix', sulong_prefix_path)
 
 def testLLVMImage(image, imageArgs=None, testFilter=None, libPath=True, test=None, unittestArgs=None):
     mx_sulong_gate.testLLVMImage(image, imageArgs, testFilter, libPath, test, unittestArgs)

Diff for: sulong/mx.sulong/suite.py

@@ -966,9 +966,9 @@
           "cmakeConfig" : {
             "CMAKE_INSTALL_RPATH" : "\\$ORIGIN",
             "LLVM_ENABLE_RUNTIMES" : "libcxx;libcxxabi;libunwind",
-            "CMAKE_ASM_FLAGS": "-ffile-prefix-map=<prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
-            "CMAKE_C_FLAGS": "-ffile-prefix-map=<prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
-            "CMAKE_CXX_FLAGS": "-ffile-prefix-map=<prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
+            "CMAKE_ASM_FLAGS": "-ffile-prefix-map=<sulong_prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
+            "CMAKE_C_FLAGS": "-ffile-prefix-map=<sulong_prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
+            "CMAKE_CXX_FLAGS": "-ffile-prefix-map=<sulong_prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
           },
         },
         "linux-musl" : {
@@ -979,9 +979,9 @@
             "CMAKE_INSTALL_RPATH" : "\\$ORIGIN",
             "LLVM_ENABLE_RUNTIMES" : "libcxx;libcxxabi;libunwind",
             "LIBCXX_HAS_MUSL_LIBC" : "YES",
-            "CMAKE_ASM_FLAGS": "-ffile-prefix-map=<prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
-            "CMAKE_C_FLAGS": "-ffile-prefix-map=<prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
-            "CMAKE_CXX_FLAGS": "-ffile-prefix-map=<prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
+            "CMAKE_ASM_FLAGS": "-ffile-prefix-map=<sulong_prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
+            "CMAKE_C_FLAGS": "-ffile-prefix-map=<sulong_prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
+            "CMAKE_CXX_FLAGS": "-ffile-prefix-map=<sulong_prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
           },
         },
         "darwin" : {
@@ -992,9 +992,9 @@
             "CMAKE_INSTALL_RPATH" : "@loader_path/",
             "LLVM_ENABLE_RUNTIMES" : "libcxx;libcxxabi;libunwind",
             "CMAKE_LIBTOOL" : "<path:LLVM_TOOLCHAIN>/bin/llvm-libtool-darwin",
-            "CMAKE_ASM_FLAGS": "-ffile-prefix-map=<prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
-            "CMAKE_C_FLAGS": "-ffile-prefix-map=<prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
-            "CMAKE_CXX_FLAGS": "-ffile-prefix-map=<prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
+            "CMAKE_ASM_FLAGS": "-ffile-prefix-map=<sulong_prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
+            "CMAKE_C_FLAGS": "-ffile-prefix-map=<sulong_prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
+            "CMAKE_CXX_FLAGS": "-ffile-prefix-map=<sulong_prefix:com.oracle.truffle.llvm.libraries.bitcode.libcxx>=llvm-project",
           },
         },
         "windows" : {