/hg/icedtea6: Unbreak debug builds.

[aph at icedtea.classpath.org]

changeset b26203d46fdd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b26203d46fdd
author: Andrew Haley  <aph at redhat.com>
date: Tue Nov 15 15:49:02 2011 -0500

	Unbreak debug builds. 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.


diffstat:

 ChangeLog               |   5 +++++
 patches/arm-debug.patch |  18 ++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diffs (67 lines):

diff -r 15d88aeb3dc4 -r b26203d46fdd ChangeLog
--- a/ChangeLog	Tue Nov 15 15:02:41 2011 -0500
+++ b/ChangeLog	Tue Nov 15 15:49:02 2011 -0500
@@ -1,3 +1,8 @@
+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.
+
 2011-11-14  Danesh Dadachanji  <ddadacha at redhat.com>
 
 	* Makefile.am: 
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