IcedTea6 on ia64

[Gary Benson]

Dennis Gilmore wrote:
> On Thursday 10 April 2008, Gary Benson wrote:
> > Ok, could someone try a build with this icedtea-ia64-bugfix.patch
> > instead of the one that's in the tree?
> 
> http://ia64.koji.fedoraproject.org/koji/getfile?taskID=54044&name=build.log  
> 
> fails with 
> Linking vm...
> bytecodeInterpreterWithChecks.o:/builddir/build/BUILD/icedtea6-1.1/openjdk-ecj/hotspot/src/cpu/zero/vm/bytes_zero.hpp:64: 
> multiple definition of `ia64_double_zero'
> bytecodeInterpreter.o:/builddir/build/BUILD/icedtea6-1.1/openjdk-ecj/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp:2708: 
> first defined here
> collect2: ld returned 1 exit status

Trust me to put it in the one file in the build that's compiled twice.
Try this instead...

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r 114e54fc994e openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Apr 04 09:33:18 2008 +0100
+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Apr 04 09:34:11 2008 +0100
@@ -382,6 +382,13 @@
           CALL_VM_NOCHECK(func);                                  \
           if (THREAD->has_pending_exception()) goto label;        \
         }
+
+/*
+ * IA64 workaround
+ */
+#if defined(IA64) && !defined(VM_JVMTI)
+double ia64_double_zero = 0.0;
+#endif
 
 /*
  * BytecodeInterpreter::run(interpreterState istate)