Unbreak debug builds
Andrew Haley
aph at redhat.com
Tue Nov 15 13:27:37 PST 2011
Obvious/trivial: my ARM debug patch broke debug builds. Fixed
thusly:
Andrew.
2011-11-15 Andrew Haley <aph at redhat.com>
* patches/arm-debug.patch: Surround all code in #ifdef PRODUCT
in order to unbreak debug builds.
diff -r 15d88aeb3dc4 -r b26203d46fdd patches/arm-debug.patch
--- a/patches/arm-debug.patch Tue Nov 15 15:02:41 2011 -0500
+++ b/patches/arm-debug.patch Tue Nov 15 15:49:02 2011 -0500
@@ -1,9 +1,11 @@
---- openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2011-09-16 19:04:00.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2011-09-19 11:40:10.000000000 +0100
-@@ -238,6 +238,18 @@
+diff -u openjdk/hotspot/src/share/vm/utilities/vmError.cpp openjdk/hotspot/src/share/vm/utilities/vmError.cpp
+--- openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2011-07-05 14:31:05.000000000 -0400
++++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2011-11-15 15:15:30.705973617 -0500
+@@ -237,6 +238,19 @@
return buf;
}
++#ifdef PRODUCT
+extern "C" void ps() {
+ fdStream out(defaultStream::output_fd());
+ JavaThread* thread = JavaThread::active();
@@ -14,27 +16,32 @@
+
+ delete[] buf;
+}
-+
++#endif // PRODUCT
+
void VMError::print_stack_trace(outputStream* st, JavaThread* jt,
char* buf, int buflen, bool verbose) {
#ifdef ZERO
+diff -u openjdk/hotspot/src/share/vm/utilities/vmError.hpp openjdk/hotspot/src/share/vm/utilities/vmError.hpp
--- openjdk/hotspot/src/share/vm/utilities/vmError.hpp 2011-07-05 14:31:05.000000000 -0400
-+++ openjdk/hotspot/src/share/vm/utilities/vmError.hpp 2011-09-19 13:38:35.000000000 -0400
-@@ -30,6 +30,8 @@
++++ openjdk/hotspot/src/share/vm/utilities/vmError.hpp 2011-11-15 15:15:30.631987981 -0500
+@@ -30,6 +30,10 @@
class VM_ReportJavaOutOfMemory;
++#ifdef PRODUCT
+extern "C" void ps();
++#endif // PRODUCT
+
class VMError : public StackObj {
friend class VM_ReportJavaOutOfMemory;
-@@ -89,6 +91,8 @@
+@@ -89,6 +93,10 @@
const char* detail_msg() const { return _detail_msg; }
bool should_report_bug(unsigned int id) { return id != oom_error; }
++#ifdef PRODUCT
+ friend void ps();
++#endif // PRODUCT
+
public:
// Constructor for crashes
More information about the distro-pkg-dev
mailing list