/hg/icedtea6: 2009-11-18 Gary Benson <gbenson at redhat.com>

[gbenson at icedtea.classpath.org]

changeset d5f77a4c9214 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d5f77a4c9214
author: Gary Benson <gbenson at redhat.com>
date: Wed Nov 18 10:56:39 2009 -0500

	2009-11-18 Gary Benson <gbenson at redhat.com>

	 * patches/icedtea-shark.patch
	(hotspot/src/share/vm/utilities/macros.hpp): IA64 is
	NOT_X86.


diffstat:

2 files changed, 8 insertions(+), 6 deletions(-)
ChangeLog                   |    6 ++++++
patches/icedtea-shark.patch |    8 ++------

diffs (31 lines):

diff -r 1daa0bb701a8 -r d5f77a4c9214 ChangeLog
--- a/ChangeLog	Wed Nov 18 14:24:09 2009 +0000
+++ b/ChangeLog	Wed Nov 18 10:56:39 2009 -0500
@@ -1,3 +1,9 @@ 2009-11-18  Gary Benson  <gbenson at redhat
+2009-11-18  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-shark.patch
+	(hotspot/src/share/vm/utilities/macros.hpp):
+	IA64 is NOT_X86.
+
 2009-11-18  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp:
diff -r 1daa0bb701a8 -r d5f77a4c9214 patches/icedtea-shark.patch
--- a/patches/icedtea-shark.patch	Wed Nov 18 14:24:09 2009 +0000
+++ b/patches/icedtea-shark.patch	Wed Nov 18 10:56:39 2009 -0500
@@ -392,12 +392,8 @@ Index: openjdk/hotspot/src/share/vm/util
 ===================================================================
 --- openjdk.orig/ports/hotspot/src/share/vm/utilities/macros.hpp	2009-11-12 15:17:14.458064088 +0100
 +++ openjdk/hotspot/src/share/vm/utilities/macros.hpp	2009-11-12 15:19:18.097063844 +0100
-@@ -146,12 +146,14 @@
- #define NOT_WINDOWS(code) code
- #endif
- 
--#if defined(IA32) || defined(AMD64)
-+#if defined(IA32) || defined(IA64) || defined(AMD64)
+@@ -146,9 +146,11 @@
+ #if defined(IA32) || defined(AMD64)
  #define X86
  #define X86_ONLY(code) code
 +#define NOT_X86(code)