# HG changeset patch
# User mbaesken
# Date 1524585385 -7200
# Node ID dbfef18ad5101da2e363b2bbfa737a2dde01c98b
# Parent  96d4658eb7f275a3ddfb2d4d2afcf9953226368f
8202200: set INCLUDE_SA to false on s390x by default
Reviewed-by: ihse, erikj, jgeorge

diff -r 96d4658eb7f2 -r dbfef18ad510 make/autoconf/jdk-options.m4
--- 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
diff -r 96d4658eb7f2 -r dbfef18ad510 src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h
--- 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