← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/openjdk-6/jaunty-security

« back to all changes in this revision

Viewing changes to patches/icedtea-zero-build.patch

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose, Edward Nevill, Matthias Klose
  • Date: 2009-03-02 16:18:01 UTC
  • Revision ID: james.westby@ubuntu.com-20090302161801-rubk3yhm8j0au4y1
Tags: 6b14-0ubuntu17
[ Edward Nevill ]
* Remove VFP from asm loop
* Disble the mauve testsuite for armel.

[Matthias Klose]
* Update IcedTea (20090302).

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/icedtea-zero-build.patch
173
173
diff -r b5e5d2ef906a openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
174
174
--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp Thu Jun 19 17:05:23 2008 +0100
175
175
+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp Fri Jun 20 10:29:14 2008 +0100
 
176
@@ -98,7 +98,11 @@
 
177
    #define VMTYPE COMPILER1_PRESENT("Client")   \
 
178
                   COMPILER2_PRESENT("Server")
 
179
 #else
 
180
+#ifdef ZERO
 
181
+  #define VMTYPE "Zero"
 
182
+#else
 
183
   #define VMTYPE "Core"
 
184
+#endif // ZERO
 
185
 #endif // COMPILER1 || COMPILER2
 
186
 #endif // TIERED
 
187
 #endif // KERNEL
176
188
@@ -143,10 +143,14 @@ const char* Abstract_VM_Version::vm_rele
177
189
                  WINDOWS_ONLY("windows")         \
178
190
                  SOLARIS_ONLY("solaris")
179
191
 
180
 
+#ifdef ZERO_LIBARCH
 
192
+#ifdef ZERO
181
193
+#define CPU      ZERO_LIBARCH
182
194
+#else
183
195
 #define CPU      IA32_ONLY("x86")                \
184
196
                  IA64_ONLY("ia64")               \
185
197
                  AMD64_ONLY("amd64")             \
186
198
                  SPARC_ONLY("sparc")
187
 
+#endif // ZERO_LIBARCH
 
199
+#endif // ZERO
188
200
 
189
201
 const char *Abstract_VM_Version::vm_platform_string() {
190
202
   return OS "-" CPU;