Skip to content

Commit

Permalink
Merge pull request eclipse-openj9#400 from eclipse/revert-393-staging…
Browse files Browse the repository at this point in the history
…BranchForPull

Revert "Configure z/TPF native stack walks as unsupported."
  • Loading branch information
pshipton authored Oct 20, 2017
2 parents 4d837b5 + d364ede commit fc4c907
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions runtime/rasdump/dmpagent.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,9 @@ static const J9RASdumpSpec rasDumpSpecs[] =
400,

J9RAS_DUMP_DO_EXCLUSIVE_VM_ACCESS
#if !defined(J9ZOS390) || !defined(J9ZTPF)
#ifndef J9ZOS390
| J9RAS_DUMP_DO_PREEMPT_THREADS
#endif /* !defined(J9ZOS390) || !defined(J9ZTPF) */
#endif
, NULL
}
},
Expand Down
6 changes: 3 additions & 3 deletions runtime/rasdump/javadump.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4335,11 +4335,11 @@ JavaCoreDumpWriter::writeThread(J9VMThread* vmThread, J9PlatformThread *nativeTh
frame = frame->parent_frame;
}
} else {
#if defined(J9ZOS390) || defined(J9ZTPF)
#if defined(J9ZOS390)
_OutputStream.writeCharacters("3XMTHREADINFO3 No native callstack available on this platform\n");
#else /* defined(J9ZOS390) || defined(J9ZTPF) */
#else
_OutputStream.writeCharacters("3XMTHREADINFO3 No native callstack available for this thread\n");
#endif /* defined(J9ZOS390) || defined(J9ZTPF) */
#endif
_OutputStream.writeCharacters("NULL\n");
}

Expand Down

0 comments on commit fc4c907

Please sign in to comment.