Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8202200: set INCLUDE_SA to false on s390x by default
authormbaesken
Tue, 24 Apr 2018 17:56:25 +0200
changeset 49920 dbfef18ad510
parent 49919 96d4658eb7f2
child 49921 b708a1e34fcc
8202200: set INCLUDE_SA to false on s390x by default Reviewed-by: ihse, erikj, jgeorge
make/autoconf/jdk-options.m4 file | annotate | diff | comparison | revisions
src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h file | annotate | diff | comparison | revisions 
--- a/make/autoconf/jdk-options.m4	Mon Apr 30 09:15:44 2018 +0200
+++ b/make/autoconf/jdk-options.m4	Tue Apr 24 17:56:25 2018 +0200
@@ -238,6 +238,9 @@
   if test "x$OPENJDK_TARGET_OS" = xaix ; then
     INCLUDE_SA=false
   fi
+  if test "x$OPENJDK_TARGET_CPU" = xs390x ; then
+    INCLUDE_SA=false
+  fi
   AC_SUBST(INCLUDE_SA)
 
   # Compress jars
--- a/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h	Mon Apr 30 09:15:44 2018 +0200
+++ b/src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h	Tue Apr 24 17:56:25 2018 +0200
@@ -75,9 +75,6 @@
 #include <asm/ptrace.h>
 #define user_regs_struct  pt_regs
 #endif
-#if defined(s390x)
-#include <asm/ptrace.h>
-#endif
 
 // This C bool type must be int for compatibility with Linux calls and
 // it would be a mistake to equivalence it to C++ bool on many platforms
jdk-sandbox