Skip to content

Commit 3ff52c1

Browse files
committed
8202200: set INCLUDE_SA to false on s390x by default
Reviewed-by: ihse, erikj, jgeorge
1 parent 55725ec commit 3ff52c1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

make/autoconf/jdk-options.m4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,9 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
238238
if test "x$OPENJDK_TARGET_OS" = xaix ; then
239239
INCLUDE_SA=false
240240
fi
241+
if test "x$OPENJDK_TARGET_CPU" = xs390x ; then
242+
INCLUDE_SA=false
243+
fi
241244
AC_SUBST(INCLUDE_SA)
242245
243246
# Compress jars

src/jdk.hotspot.agent/linux/native/libsaproc/libproc.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ combination of ptrace and /proc calls.
7575
#include <asm/ptrace.h>
7676
#define user_regs_struct pt_regs
7777
#endif
78-
#if defined(s390x)
79-
#include <asm/ptrace.h>
80-
#endif
8178

8279
// This C bool type must be int for compatibility with Linux calls and
8380
// it would be a mistake to equivalence it to C++ bool on many platforms

0 commit comments

Comments
 (0)