summaryrefslogtreecommitdiffstats
path: root/recipes-core/icedtea/icedtea6-native-1.8.11
diff options
context:
space:
mode:
authorSteffen Sledz <sledz@dresearch-fe.de>2012-10-05 15:22:33 +0200
committerHenning Heinold <heinold@inf.fu-berlin.de>2012-11-09 11:59:51 +0100
commit99bd206eb1c8ca285e676886a7d6329b40ae4c66 (patch)
treeaa767b6905c78db5c260636edb560cd2b0ef81db /recipes-core/icedtea/icedtea6-native-1.8.11
parent819348073b54148c1dd24f0f11725b89f6965818 (diff)
downloadmeta-java-99bd206eb1c8ca285e676886a7d6329b40ae4c66.tar.gz
icedtea6-native: fix compile error
Don't return booleans from methods returning pointers. see also: <http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/f457154eee8b> - commit was modified, removed the 1.7 version stuff Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
Diffstat (limited to 'recipes-core/icedtea/icedtea6-native-1.8.11')
-rw-r--r--recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-dont-return-booleans.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-dont-return-booleans.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-dont-return-booleans.patch
new file mode 100644
index 0000000..73f90b3
--- /dev/null
+++ b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-dont-return-booleans.patch
@@ -0,0 +1,12 @@
1diff -Nurd openjdk/hotspot/src/share/vm/opto/loopnode.cpp openjdk/hotspot/src/share/vm/opto/loopnode.cpp
2--- openjdk/hotspot/src/share/vm/opto/loopnode.cpp 2012-10-05 14:18:19.725747261 +0200
3+++ openjdk/hotspot/src/share/vm/opto/loopnode.cpp 2012-10-05 14:18:40.751035242 +0200
4@@ -534,7 +534,7 @@
5 Node* CountedLoopNode::match_incr_with_optional_truncation(
6 Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) {
7 // Quick cutouts:
8- if (expr == NULL || expr->req() != 3) return false;
9+ if (expr == NULL || expr->req() != 3) return NULL;
10
11 Node *t1 = NULL;
12 Node *t2 = NULL;