# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1443540651 -7200
# Node ID 219a35438fb794409661c8b0d476e1afadb5b6a7
# Parent  f53dfbf08c71ea1f202ef1f101a1d4ee374d9cab# Parent  e778e9aaed23bd8cfa8644b0c6ee4e97da6369fb
Merge.

diff -r f53dfbf08c71 -r 219a35438fb7 agent/src/os/linux/libproc.h
--- 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
 
 /************************************************************************************
 
diff -r f53dfbf08c71 -r 219a35438fb7 mx.jvmci/mx_jvmci.py
--- 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'):
diff -r f53dfbf08c71 -r 219a35438fb7 mx.jvmci/suite.py
--- 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" : {