Merge 'origin/master' into gh-636-virtual-CAS-GR-11741

Author: gilles-duboscq

.travis.yml

@@ -20,13 +20,38 @@ env:
   global:
     - JVMCI_VERSION="jvmci-0.48"
     - JDK8_UPDATE_VERSION="172"
-  matrix:
-    - JDK="jdk8" GATE="style,fullbuild"
-    - JDK="jdk8" GATE="build,test"
-    - JDK="jdk8" GATE="build,bootstraplite"
-    - JDK="jdk11" GATE="style,fullbuild"
-    - JDK="jdk11" GATE="build,test"
-    - JDK="jdk11" GATE="build,bootstraplite"
+
+matrix:
+  include:
+  - env: JDK="jdk8" GATE="style,fullbuild" PRIMARY="compiler"
+  - env: JDK="jdk8" GATE="build,test" PRIMARY="compiler"
+  - env: JDK="jdk8" GATE="build,test" PRIMARY="substratevm"
+  - env: JDK="jdk8" GATE="build,bootstraplite" PRIMARY="compiler"
+  - env: JDK="jdk8" GATE="style,fullbuild,sulongBasic" PRIMARY="sulong" LLVM_VERSION="3.8"
+    addons:
+      apt:
+        packages:
+          - python-pip
+          - clang-3.8
+          - llvm-3.8
+          - clang-format-3.8
+          - libc++1
+          - libc++-dev
+  - env: JDK="jdk8" GATE="build,sulong" PRIMARY="vm" DYNAMIC_IMPORTS="/sulong,/substratevm" LLVM_VERSION="6.0" DISABLE_POLYGLOT=true DISABLE_LIBPOLYGLOT=true NATIVE_IMAGE_TESTING=true
+    addons:
+      apt:
+        sources:
+          - ubuntu-toolchain-r-test
+          - llvm-toolchain-trusty-6.0
+        packages:
+          - clang-6.0
+          - llvm-6.0
+          - libc++1
+          - libc++-dev
+  - env: JDK="jdk11" GATE="style,fullbuild" PRIMARY="compiler"
+  - env: JDK="jdk11" GATE="build,test" PRIMARY="compiler"
+  - env: JDK="jdk11" GATE="build,bootstraplite" PRIMARY="compiler"
+
 install:
   - |
       export MX_PATH=${TRAVIS_BUILD_DIR}/../mx
@@ -44,6 +69,9 @@ install:
         wget http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz -O ${ECLIPSE_TAR}
         tar -C ${TRAVIS_BUILD_DIR}/.. -xzf ${ECLIPSE_TAR}
         export ECLIPSE_EXE=${TRAVIS_BUILD_DIR}/../eclipse/eclipse
+
+        # the style gate needs the full commit history for checking copyright years
+        git fetch --unshallow
       fi
   - |
       if [[ ${GATE} == *fullbuild* ]]
@@ -63,10 +91,19 @@ install:
         tar -C ${TRAVIS_BUILD_DIR}/.. -xzf ${JDK_TAR}
         export JAVA_HOME=${TRAVIS_BUILD_DIR}/../openjdk1.8.0_${JDK8_UPDATE_VERSION}-${JVMCI_VERSION}
       fi
+  - |
+      if [ "${LLVM_VERSION}" != "" ]
+      then
+        export CLANG=clang-$LLVM_VERSION
+        export CLANGXX=clang++-$LLVM_VERSION
+        export OPT=opt-$LLVM_VERSION
+        export LLVM_AS=llvm-as-$LLVM_VERSION
+        export LLVM_LINK=llvm-link-$LLVM_VERSION
+      fi
 
 script:
   - echo ${JAVA_HOME}
   - ${JAVA_HOME}/bin/java -version
-  - mx -v --primary-suite-path ${TRAVIS_BUILD_DIR}/compiler --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE}
+  - mx --primary-suite-path ${TRAVIS_BUILD_DIR}/${PRIMARY} --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE}
 after_failure:
   - cat hs_err*

README.md

@@ -25,6 +25,8 @@ implemented with the instrumentation framework.
 compilation of Java applications under closed-world assumption into executable
 images or shared objects.
 
+* [Sulong](sulong/README.md) is an engine for running LLVM bitcode on GraalVM.
+
 * [TRegex](regex/README.md) is an implementation of regular expressions which leverages GraalVM for efficient compilation of automata.
 
 * [VM](vm/README.md) includes the components to build a modular GraalVM image.
@@ -36,17 +38,16 @@ GralVM allows running of following languages which are being developed and teste
 * [FastR](https://github.com/oracle/fastr) - R Language 3.4.0
 * [GraalPython](https://github.com/graalvm/graalpython) - Python 3.7
 * [TruffleRuby](https://github.com/oracle/truffleruby/) - Ruby Programming Language 2.3.7
-* [Sulong](https://github.com/graalvm/sulong) - LLVM bitcode interpreter
 * [SimpleLanguage](https://github.com/graalvm/simplelanguage) - A simple demonstration language for the GraalVM.
 
 
 ## License
 
 Each GraalVM component is licensed:
-* [Truffle](/truffle/) and its dependency [Graal SDK](/sdk/) are licensed under
-the [GPL 2 with Classpath exception](truffle/LICENSE.GPL.md).
+* [Truffle](/truffle/) and its dependency [Graal SDK](/sdk/) are licensed under the [Universal Permissive License](truffle/LICENSE.md).
 * [Tools](/tools/) project is licensed under the [GPL 2 with Classpath exception](tools/LICENSE.GPL.md).
 * [TRegex](/regex/) project is licensed under the [GPL 2 with Classpath exception](regex/LICENSE.GPL.md).
 * The [Graal compiler](/compiler/) is licensed under the [GPL 2 with Classpath exception](compiler/LICENSE.md).
 * [Substrate VM](/substratevm/) is licensed under the [GPL 2 with Classpath exception](substratevm/LICENSE.md).
+* [Sulong](/sulong/) is licensed under [3-clause BSD](sulong/LICENSE).
 * [VM](/vm/) is licensed under the [GPL 2 with Classpath exception](vm/GraalCE_license_3rd_party_license.txt).

ci.hocon

@@ -19,6 +19,9 @@ include "tools/ci.hocon"
 #Regex
 include "regex/ci.hocon"
 
+#Sulong
+include "sulong/ci.hocon"
+
 #Examples
 #Examples gate also disabled.
 #include "examples/ci.hocon"
@@ -33,14 +36,10 @@ include "compiler/ci_includes/deploy.hocon"
 
 include "compiler/ci_common/bench.hocon"
 include "compiler/ci_common/bench-hwloc.hocon"
-include "compiler/ci_common/x32.hocon"
-include "compiler/ci_common/x32-tracera.hocon"
 include "compiler/ci_common/x52.hocon"
 include "compiler/ci_common/x52-tracera.hocon"
-include "compiler/ci_common/x4150.hocon"
 include "compiler/ci_common/m7_eighth.hocon"
 # C1 & C2 configs
-include "compiler/ci_includes/x32-c2.hocon"
 include "compiler/ci_includes/x52-c1.hocon"
 include "compiler/ci_includes/x52-c2.hocon"
 include "compiler/ci_includes/m7_eighth-c1.hocon"

ci_includes/publish-javadoc.hocon

@@ -33,7 +33,7 @@ builds += [
         ["git", "add", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"],
         ["git", "config", "user.name", "Javadoc Publisher"],
         ["git", "config", "user.email", "[email protected]"],
-        ["git", "commit", "-m", [ "echo", "Javadoc as of", [ "date", "+%Y/%m/%d" ] ] ],
+        ["git", "diff", "--staged", "--quiet", "||", "git", "commit", "-m", [ "echo", "Javadoc as of", [ "date", "+%Y/%m/%d" ] ] ],
         ["git", "push", "origin", "gh-pages"],
     ],
     targets : [post-merge],

common.hocon

@@ -1,5 +1,5 @@
 # overlay version
-overlay = 0b7edfaa83017fcf38687f2615533dbdbe21dab1
+overlay = e2d86bcb06922e4d9017e675376ed7515902392c
 
 # oraclejdk* are released OracleJDK binaries
 # labsjdk* are JDKs based on OracleJDK binaries