Mercurial > hg > graal-jvmci-8
changeset 22630:219a35438fb7
Merge.
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 29 Sep 2015 17:30:51 +0200 |
| parents | f53dfbf08c71 (current diff) e778e9aaed23 (diff) |
| children | 19ce432d854d |
| files | |
| diffstat | 3 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/agent/src/os/linux/libproc.h Tue Sep 29 17:28:55 2015 +0200 +++ b/agent/src/os/linux/libproc.h Tue Sep 29 17:30:51 2015 +0200 @@ -34,7 +34,11 @@ #include "libproc_md.h" #endif +#if defined(sparcv9) && defined(linux) +#include <asm/ptrace.h> +#else #include <sys/ptrace.h> +#endif /************************************************************************************
--- a/mx.jvmci/mx_jvmci.py Tue Sep 29 17:28:55 2015 +0200 +++ b/mx.jvmci/mx_jvmci.py Tue Sep 29 17:30:51 2015 +0200 @@ -921,6 +921,10 @@ setMakeVar('HOTSPOT_BUILD_JOBS', str(cpus), env=env) setMakeVar('ALT_BOOTDIR', get_jvmci_bootstrap_jdk().home, env=env) # setMakeVar("EXPORT_PATH", jdk) + if mx.get_os() == 'linux' and platform.processor() == 'sparc64': + # SPARC/Linux + setMakeVar("DEBUG_BINARIES", "true", env=env) + setMakeVar("EXTRA_CFLAGS", "-Wno-conversion-null -Wno-int-to-pointer-cast -Wno-unused-function", env=env) setMakeVar('MAKE_VERBOSE', 'y' if mx._opts.verbose else '') if self.vm.endswith('nojvmci'):
--- a/mx.jvmci/suite.py Tue Sep 29 17:28:55 2015 +0200 +++ b/mx.jvmci/suite.py Tue Sep 29 17:30:51 2015 +0200 @@ -330,6 +330,9 @@ "linux" : { "amd64" : { "path" : "build/<vmbuild>/linux/amd64/<vm>/jvm.tar", + }, + "sparcv9" : { + "path" : "build/<vmbuild>/linux/sparcv9/<vm>/jvm.tar", } }, "darwin" : {