FYI: [icedtea] Reapply icedtea-sparc.patch as new minimal version
Andrew John Hughes
gnu_andrew at member.fsf.org
Mon Jun 23 11:46:14 PDT 2008
This adds back part of the icedtea-sparc.patch which isn't in
OpenJDK. Thanks to doko for pointing this out.
ChangeLog:
2008-06-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
* HACKING:
Add icedtea-sparc.patch to general section.
* Makefile.am:
Add icedtea-sparc.patch again.
* Makefile.in:
Regenerated.
* patches/icedtea-sparc.patch:
New IcedTea minimal version.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 5fbe762d9c35 HACKING
--- a/HACKING Mon Jun 23 15:23:34 2008 +0100
+++ b/HACKING Mon Jun 23 19:44:03 2008 +0100
@@ -40,6 +40,7 @@ The following patches are currently appl
* icedtea-override-redirect-metacity.patch: Enable override redirect for Metacity window manager.
* icedtea-lsb-release.patch: Generate Debian LSB file.
* icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones.
+* icedtea-sparc.patch: Add support for GNU/Linux on SPARC (version in IcedTea includes only minimal build changes).
* icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora.
* icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly.
* icedtea-sparc-trapsfix.patch: Include traps.h from correct directory.
@@ -60,7 +61,6 @@ The following patches are only applied t
* icedtea-dnd-updatecursor.patch: Fix unexpected cursor returned by DragSourceContext (S6691328). Fixed in OpenJDK7 b29.
* icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
* icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
-* icedtea-sparc.patch: Add support for GNU/Linux on SPARC.
The following patches are only applied to OpenJDK in IcedTea:
diff -r 5fbe762d9c35 Makefile.am
--- a/Makefile.am Mon Jun 23 15:23:34 2008 +0100
+++ b/Makefile.am Mon Jun 23 19:44:03 2008 +0100
@@ -338,6 +338,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-fonts.patch \
patches/icedtea-gervill.patch \
patches/icedtea-directaudio-close-trick.patch \
+ patches/icedtea-sparc.patch \
patches/icedtea-sparc64-linux.patch \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
diff -r 5fbe762d9c35 Makefile.in
--- a/Makefile.in Mon Jun 23 15:23:34 2008 +0100
+++ b/Makefile.in Mon Jun 23 19:44:03 2008 +0100
@@ -420,6 +420,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
patches/icedtea-color-createcontext.patch \
patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
patches/icedtea-directaudio-close-trick.patch \
+ patches/icedtea-sparc.patch \
patches/icedtea-sparc64-linux.patch \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
diff -r 5fbe762d9c35 patches/icedtea-sparc.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc.patch Mon Jun 23 19:44:03 2008 +0100
@@ -0,0 +1,79 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2008-06-23 03:35:43.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-06-23 18:57:15.000000000 +0100
+@@ -59,7 +59,7 @@
+ endif
+
+ # sparc
+-ifeq ($(ARCH), sparc64)
++ifneq (,$(filter $(ARCH), sparc sparc64))
+ ifeq ($(ARCH_DATA_MODEL), 64)
+ ARCH_DATA_MODEL = 64
+ MAKE_ARGS += LP64=1
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
+--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-06-23 03:35:43.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-06-23 18:57:15.000000000 +0100
+@@ -52,6 +52,10 @@
+ PICFLAG = -fpic
+ endif
+
++ifneq ($(filter sparc sparcv9,$(BUILDARCH)),)
++PICFLAG = -fPIC
++endif
++
+ VM_PICFLAG/LIBJVM = $(PICFLAG)
+ VM_PICFLAG/AOUT =
+
+diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp 2008-06-22 20:44:42.000000000 +0100
++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp 2008-06-23 18:57:15.000000000 +0100
+@@ -44,3 +44,49 @@
+ // Used to register dynamic code cache area with the OS
+ // Note: Currently only used in 64 bit Windows implementations
+ static bool register_code_area(char *low, char *high) { return true; }
++/*
++ * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ *
++ */
++
++ //
++ // NOTE: we are back in class os here, not Linux
++ //
++ static jint (*atomic_xchg_func) (jint, volatile jint*);
++ static jint (*atomic_cmpxchg_func) (jint, volatile jint*, jint);
++ static jlong (*atomic_cmpxchg_long_func)(jlong, volatile jlong*, jlong);
++ static jint (*atomic_add_func) (jint, volatile jint*);
++ static void (*fence_func) ();
++
++ static jint atomic_xchg_bootstrap (jint, volatile jint*);
++ static jint atomic_cmpxchg_bootstrap (jint, volatile jint*, jint);
++ static jlong atomic_cmpxchg_long_bootstrap(jlong, volatile jlong*, jlong);
++ static jint atomic_add_bootstrap (jint, volatile jint*);
++ static void fence_bootstrap ();
++
++ static void setup_fpu() {}
++
++ static bool is_allocatable(size_t bytes);
++
++ // Used to register dynamic code cache area with the OS
++ // Note: Currently only used in 64 bit Windows implementations
++ static bool register_code_area(char *low, char *high) { return true; }
More information about the distro-pkg-dev
mailing list