diff options
| author | glewis <glewis@FreeBSD.org> | 2010-01-22 14:32:22 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2010-01-22 14:32:22 +0800 |
| commit | d56f4a6c686d3307f271b801bbe9833ed9e44d3b (patch) | |
| tree | 1cb9082f83dff2c0d8102418e6724bd56039d94c /java/openjdk7 | |
| parent | 0e1c88646776d68cd88392bc48ce938aede4b99f (diff) | |
| download | freebsd-ports-gnome-d56f4a6c686d3307f271b801bbe9833ed9e44d3b.tar.gz freebsd-ports-gnome-d56f4a6c686d3307f271b801bbe9833ed9e44d3b.tar.zst freebsd-ports-gnome-d56f4a6c686d3307f271b801bbe9833ed9e44d3b.zip | |
. 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)
Diffstat (limited to 'java/openjdk7')
| -rw-r--r-- | java/openjdk7/files/patch-nmethod.cpp | 11 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-nmethod.hpp | 11 |
2 files changed, 22 insertions, 0 deletions
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. |