From be21ee8a498eda4921acc37402d72aaaa825399f Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Fri, 22 Jan 2010 06:32:22 +0000 Subject: . Pull down a fix for an unsigned/signed comparison error that hasn't made it into a build yet. This causes a build breakage on 6.x/amd64 at least. Pointed out by: pointyhat (via pav) --- java/openjdk7/files/patch-nmethod.cpp | 11 +++++++++++ java/openjdk7/files/patch-nmethod.hpp | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 java/openjdk7/files/patch-nmethod.cpp create mode 100644 java/openjdk7/files/patch-nmethod.hpp (limited to 'java') diff --git a/java/openjdk7/files/patch-nmethod.cpp b/java/openjdk7/files/patch-nmethod.cpp new file mode 100644 index 000000000000..37f122675a86 --- /dev/null +++ b/java/openjdk7/files/patch-nmethod.cpp @@ -0,0 +1,11 @@ +--- hotspot/src/share/vm/code/nmethod.cpp Tue Jan 05 11:16:09 2010 -0800 ++++ hotspot/src/share/vm/code/nmethod.cpp Tue Jan 05 16:12:26 2010 -0800 +@@ -1170,7 +1170,7 @@ void nmethod::log_state_change() const { + } + + // Common functionality for both make_not_entrant and make_zombie +-bool nmethod::make_not_entrant_or_zombie(int state) { ++bool nmethod::make_not_entrant_or_zombie(unsigned int state) { + assert(state == zombie || state == not_entrant, "must be zombie or not_entrant"); + + // If the method is already zombie there is nothing to do diff --git a/java/openjdk7/files/patch-nmethod.hpp b/java/openjdk7/files/patch-nmethod.hpp new file mode 100644 index 000000000000..042184a216a2 --- /dev/null +++ b/java/openjdk7/files/patch-nmethod.hpp @@ -0,0 +1,11 @@ +--- hotspot/src/share/vm/code/nmethod.hpp Tue Jan 05 11:16:09 2010 -0800 ++++ hotspot/src/share/vm/code/nmethod.hpp Tue Jan 05 16:12:26 2010 -0800 +@@ -255,7 +255,7 @@ class nmethod : public CodeBlob { + const char* reloc_string_for(u_char* begin, u_char* end); + // Returns true if this thread changed the state of the nmethod or + // false if another thread performed the transition. +- bool make_not_entrant_or_zombie(int state); ++ bool make_not_entrant_or_zombie(unsigned int state); + void inc_decompile_count(); + + // used to check that writes to nmFlags are done consistently. -- cgit v1.2.3