Mercurial > hg > graal-jvmci-8
changeset 21677:7a8a5bb5ec56
Merge.
author | Chris Seaton <chris.seaton@oracle.com> |
---|---|
date | Wed, 03 Jun 2015 00:06:34 +0100 |
parents | 90bccd2369d9 (diff) 2e8c01def9a5 (current diff) |
children | 74943b9d532a |
files | graal/com.oracle.graal.amd64/src/com/oracle/graal/amd64/AMD64.java graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotRegisterConfig.java graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/jvmci/AMD64HotSpotJVMCIBackendFactory.java graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotRegisterConfig.java graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/jvmci/SPARCHotSpotJVMCIBackendFactory.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotTargetDescription.java graal/com.oracle.graal.sparc/src/com/oracle/graal/sparc/SPARC.java mx/suite.py |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/suite.py Wed Jun 03 00:30:44 2015 +0200 +++ b/mx/suite.py Wed Jun 03 00:06:34 2015 +0100 @@ -1141,7 +1141,7 @@ "sourceDirs" : ["src"], "dependencies" : ["com.oracle.truffle.api"], "checkstyle" : "com.oracle.truffle.api", - "javaCompliance" : "1.8", + "javaCompliance" : "1.7", "workingSets" : "Truffle,Tools", }, @@ -1355,6 +1355,7 @@ "com.oracle.nfi", "com.oracle.truffle.interop", "com.oracle.truffle.object.basic", + "com.oracle.truffle.tools" ], "distDependencies" : [ "JVMCI_SERVICE",