changeset in /hg/icedtea: Merge jscheme patch to tip.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Sun Jun 22 12:34:54 PDT 2008
changeset 03aeec329490 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=03aeec329490
description:
Merge jscheme patch to tip.
diffstat:
11 files changed, 268 insertions(+), 18 deletions(-)
ChangeLog | 36 +++++++++++
Makefile.am | 22 +++++-
Makefile.in | 30 ++++++---
acinclude.m4 | 10 +++
configure | 14 ++++
generated/sun/misc/Version.java | 4 -
generated/sun/tools/jconsole/Version.java | 2
patches/icedtea-no-bcopy.patch | 20 ++++++
patches/icedtea-sparc-ptracefix.patch | 34 ++++++++++
patches/icedtea-sparc-trapsfix.patch | 21 ++++++
patches/icedtea-sparc64-linux.patch | 93 +++++++++++++++++++++++++++++
diffs (491 lines):
diff -r 2a13fc138cfa -r 03aeec329490 ChangeLog
--- a/ChangeLog Tue Jun 10 03:17:12 2008 +0100
+++ b/ChangeLog Mon Jun 16 20:04:22 2008 +0100
@@ -9,6 +9,42 @@ 2008-06-09 Andrew John Hughes <gnu_and
tree.
* patches/icedtea-jscheme.patch: Added.
+2008-06-11 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
+ like the Sun's verify Java version applet, check for the "_" in the
+ version string. Our version string format is now correct:
+ java version "1.6.0_0"
+ OpenJDK Runtime Environment (build 1.6.0_0-b10)
+ OpenJDK Server VM (build 1.6.0_0-b10, mixed mode)
+ * Makefile.in: Regenerated.
+
+2008-06-10 Lillian Angel <langel at redhat.com>
+
+ * Makefile.in: Regenerated.
+ * aclocal.m4: Likewise.
+ * configure: Likewise.
+ * generated/sun/misc/Version.java: Likewise.
+ * generated/sun/tools/jconsole/Version.java: Likewise.
+
+2008-06-10 Matthias Klose <doko at ubuntu.com>
+
+ * patches/icedtea-no-bcopy.patch: New.
+ * Makefile.am (ICEDTEA_PATCHES): Add patch.
+ * Makefile.in: Regenerate.
+
+2008-06-10 Tom Callaway <tcallawa at redhat.com>
+ Dennis Gilmore <dennis at ausil.us>
+
+ * patches/icedtea-sparc64-linux.patch,
+ patches/icedtea-sparc-ptracefix.patch,
+ patches/icedtea-sparc-trapsfix.patch: New.
+ * Makefile.am (ICEDTEA_PATCHES): Add above patches.
+ * Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
+ symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
+ * acinclude.m4: Set JRE_ARCH_DIR.
+ * Makefile.in, configure: Regenerate.
+
2008-06-09 Joshua Sumali <jsumali at redhat.com>
* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
diff -r 2a13fc138cfa -r 03aeec329490 Makefile.am
--- a/Makefile.am Tue Jun 10 03:17:12 2008 +0100
+++ b/Makefile.am Mon Jun 16 20:04:22 2008 +0100
@@ -64,6 +64,7 @@ ICEDTEA_BOOT_DIR= \
$(abs_top_builddir)/bootstrap/jdk1.6.0
ICEDTEA_ENDORSED_DIR = \
$(ICEDTEA_BOOT_DIR)/lib/endorsed
+JDK_UPDATE_VERSION = 0
if CORE_BUILD
ICEDTEA_CORE_BUILD = yes
else
@@ -78,8 +79,9 @@ ICEDTEA_ENV = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
"BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+ "JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+ "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -136,8 +138,9 @@ ICEDTEA_ENV_ECJ = \
"ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" \
"BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
+ "JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+ "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
"LANG=C" \
"PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -320,7 +323,11 @@ ICEDTEA_PATCHES = \
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 \
patches/icedtea-override-redirect-metacity.patch \
+ patches/icedtea-no-bcopy.patch \
patches/icedtea-jscheme.patch \
$(GCC_PATCH) \
$(DISTRIBUTION_PATCHES)
@@ -516,8 +523,13 @@ stamps/bootstrap-directory-ecj.stamp:
if test -d $(SYSTEM_GCJ_DIR); \
then \
mkdir -p bootstrap/ecj/jre/lib; \
- ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+ ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
bootstrap/ecj/jre/lib/; \
+ if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+ then \
+ ln -sf ./$(JRE_ARCH_DIR) \
+ bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+ fi; \
mkdir -p bootstrap/ecj/include; \
for i in $(SYSTEM_GCJ_DIR)/include/*; do \
test -r $$i | continue; \
diff -r 2a13fc138cfa -r 03aeec329490 Makefile.in
--- a/Makefile.in Tue Jun 10 03:17:12 2008 +0100
+++ b/Makefile.in Mon Jun 16 20:04:22 2008 +0100
@@ -138,6 +138,7 @@ JAVA = @JAVA@
JAVA = @JAVA@
JAVAC = @JAVAC@
JAVAH = @JAVAH@
+JRE_ARCH_DIR = @JRE_ARCH_DIR@
LDFLAGS = @LDFLAGS@
LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
LIBFFI_LIBS = @LIBFFI_LIBS@
@@ -285,15 +286,17 @@ ICEDTEA_ENDORSED_DIR = \
ICEDTEA_ENDORSED_DIR = \
$(ICEDTEA_BOOT_DIR)/lib/endorsed
+JDK_UPDATE_VERSION = 0
@CORE_BUILD_FALSE at ICEDTEA_CORE_BUILD =
@CORE_BUILD_TRUE at ICEDTEA_CORE_BUILD = yes
@ZERO_BUILD_FALSE at ICEDTEA_ZERO_BUILD =
@ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
- "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+ "JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+ "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
@@ -325,9 +328,10 @@ ICEDTEA_CLS_DIR_ECJ = \
ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
- "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
- "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
+ "JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
+ "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
@@ -423,9 +427,12 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
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 \
patches/icedtea-override-redirect-metacity.patch \
- patches/icedtea-jscheme.patch $(GCC_PATCH) \
- $(DISTRIBUTION_PATCHES) $(am__append_7)
+ patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
+ $(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
# Patch OpenJDK for plug replacements and ecj.
ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
@@ -1005,8 +1012,13 @@ stamps/bootstrap-directory-ecj.stamp:
if test -d $(SYSTEM_GCJ_DIR); \
then \
mkdir -p bootstrap/ecj/jre/lib; \
- ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) \
+ ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR) \
bootstrap/ecj/jre/lib/; \
+ if ! test -d /jre/lib/$(INSTALL_ARCH_DIR); \
+ then \
+ ln -sf ./$(JRE_ARCH_DIR) \
+ bootstrap/ecj/jre/lib/$(INSTALL_ARCH_DIR); \
+ fi; \
mkdir -p bootstrap/ecj/include; \
for i in $(SYSTEM_GCJ_DIR)/include/*; do \
test -r $$i | continue; \
diff -r 2a13fc138cfa -r 03aeec329490 acinclude.m4
--- a/acinclude.m4 Tue Jun 10 03:17:12 2008 +0100
+++ b/acinclude.m4 Mon Jun 16 20:04:22 2008 +0100
@@ -4,22 +4,32 @@ AC_DEFUN([SET_ARCH_DIRS],
x86_64-*-*)
BUILD_ARCH_DIR=amd64
INSTALL_ARCH_DIR=amd64
+ JRE_ARCH_DIR=amd64
;;
i?86-*-*)
BUILD_ARCH_DIR=i586
INSTALL_ARCH_DIR=i386
+ JRE_ARCH_DIR=i386
;;
arm*-*-*)
BUILD_ARCH_DIR=arm
INSTALL_ARCH_DIR=arm
+ JRE_ARCH_DIR=arm
;;
+ sparc64-*-*)
+ BUILD_ARCH_DIR=sparcv9
+ INSTALL_ARCH_DIR=sparcv9
+ JRE_ARCH_DIR=sparc64
+ ;;
*)
BUILD_ARCH_DIR=`uname -m`
INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+ JRE_ARCH_DIR=$INSTALL_ARCH_DIR
;;
esac
AC_SUBST(BUILD_ARCH_DIR)
AC_SUBST(INSTALL_ARCH_DIR)
+ AC_SUBST(JRE_ARCH_DIR)
])
AC_DEFUN([FIND_JAVAC],
diff -r 2a13fc138cfa -r 03aeec329490 configure
--- a/configure Tue Jun 10 03:17:12 2008 +0100
+++ b/configure Mon Jun 16 20:04:22 2008 +0100
@@ -734,6 +734,7 @@ PARALLEL_JOBS
PARALLEL_JOBS
BUILD_ARCH_DIR
INSTALL_ARCH_DIR
+JRE_ARCH_DIR
JAVA
JAVAC
JAVAH
@@ -5966,20 +5967,30 @@ fi
x86_64-*-*)
BUILD_ARCH_DIR=amd64
INSTALL_ARCH_DIR=amd64
+ JRE_ARCH_DIR=amd64
;;
i?86-*-*)
BUILD_ARCH_DIR=i586
INSTALL_ARCH_DIR=i386
+ JRE_ARCH_DIR=i386
;;
arm*-*-*)
BUILD_ARCH_DIR=arm
INSTALL_ARCH_DIR=arm
+ JRE_ARCH_DIR=arm
;;
+ sparc64-*-*)
+ BUILD_ARCH_DIR=sparcv9
+ INSTALL_ARCH_DIR=sparcv9
+ JRE_ARCH_DIR=sparc64
+ ;;
*)
BUILD_ARCH_DIR=`uname -m`
INSTALL_ARCH_DIR=$BUILD_ARCH_DIR
+ JRE_ARCH_DIR=$INSTALL_ARCH_DIR
;;
esac
+
@@ -12976,6 +12987,7 @@ PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim
PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim
BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
+JRE_ARCH_DIR!$JRE_ARCH_DIR$ac_delim
JAVA!$JAVA$ac_delim
JAVAC!$JAVAC$ac_delim
JAVAH!$JAVAH$ac_delim
@@ -13045,7 +13057,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 2a13fc138cfa -r 03aeec329490 generated/sun/misc/Version.java
--- a/generated/sun/misc/Version.java Tue Jun 10 03:17:12 2008 +0100
+++ b/generated/sun/misc/Version.java Mon Jun 16 20:04:22 2008 +0100
@@ -36,10 +36,10 @@ public class Version {
"1.6.0";
private static final String java_runtime_name =
- "IcedTea Runtime Environment";
+ "OpenJDK Runtime Environment";
private static final String java_runtime_version =
- "1.6.0-b09";
+ "1.6.0-b10";
static {
init();
diff -r 2a13fc138cfa -r 03aeec329490 generated/sun/tools/jconsole/Version.java
--- a/generated/sun/tools/jconsole/Version.java Tue Jun 10 03:17:12 2008 +0100
+++ b/generated/sun/tools/jconsole/Version.java Mon Jun 16 20:04:22 2008 +0100
@@ -29,7 +29,7 @@ import java.io.PrintStream;
public class Version {
private static final String jconsole_version =
- "1.6.0-b09";
+ "1.6.0-b10";
public static void print(PrintStream ps) {
printFullVersion(ps);
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-no-bcopy.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-no-bcopy.patch Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,20 @@
+--- openjdk/hotspot/src/share/vm/libadt/port.hpp~ 2008-05-30 10:02:00.000000000 +0200
++++ openjdk/hotspot/src/share/vm/libadt/port.hpp 2008-06-09 16:37:47.623812737 +0200
+@@ -37,17 +37,6 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#undef bzero
+-inline void bzero(void *b, int len) { memset(b,0,len); }
+-#undef bcopy
+-inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
+-#undef bcmp
+-inline int bcmp(const void *s,const void *t,int len) { return memcmp(s,t,len);}
+-extern "C" unsigned long strtoul(const char *s, char **end, int base);
+-
+-// Definition for sys_errlist varies from Sun 4.1 & Solaris.
+-// We use the new Solaris definition.
+-#include <string.h>
+
+ // Access to the C++ class virtual function pointer
+ // Put the class in the macro
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-sparc-ptracefix.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc-ptracefix.patch Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,34 @@
+diff -up openjdk/hotspot/agent/src/os/linux/libproc.h.BAD openjdk/hotspot/agent/src/os/linux/libproc.h
+--- openjdk/hotspot/agent/src/os/linux/libproc.h.BAD 2008-05-29 19:03:34.000000000 -0400
++++ openjdk/hotspot/agent/src/os/linux/libproc.h 2008-05-29 19:01:45.000000000 -0400
+@@ -34,14 +34,25 @@
+
+ #if defined(sparc) || defined(sparcv9)
+ /*
+- If _LP64 is defined ptrace.h should be taken from /usr/include/asm-sparc64
+- otherwise it should be from /usr/include/asm-sparc
+- These two files define pt_regs structure differently
++ Taken from asm-sparc/ptrace.h and asm-sparc64/ptrace.h
+ */
+ #ifdef _LP64
+-#include "asm-sparc64/ptrace.h"
++struct pt_regs {
++ unsigned long u_regs[16]; /* globals and ins */
++ unsigned long tstate;
++ unsigned long tpc;
++ unsigned long tnpc;
++ unsigned int y;
++ unsigned int fprs;
++};
+ #else
+-#include "asm-sparc/ptrace.h"
++struct pt_regs {
++ unsigned long psr;
++ unsigned long pc;
++ unsigned long npc;
++ unsigned long y;
++ unsigned long u_regs[16]; /* globals and ins */
++};
+ #endif
+
+ #endif //sparc or sparcv9
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-sparc-trapsfix.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc-trapsfix.patch Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,21 @@
+diff -up openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp
+--- openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD 2008-05-28 11:49:06.000000000 -0500
++++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2008-05-28 11:51:56.000000000 -0500
+@@ -25,7 +25,16 @@
+ #include "incls/_precompiled.incl"
+ #include "incls/_assembler_linux_sparc.cpp.incl"
+
+-#include <asm-sparc/traps.h>
++/* Headers for 32bit sparc with a 32bit userland end up in asm/
++ * Headers for 32bit sparc with a 64bit userland end up in asm-sparc/
++ * There is no traps.h in asm-sparc64/
++ */
++
++#if defined(__sparc__) && defined(__arch64__)
++# include <asm-sparc/traps.h>
++#else
++# include <asm/traps.h>
++#endif
+
+ bool MacroAssembler::needs_explicit_null_check(intptr_t offset) {
+ // Since the linux kernel resides at the low end of
diff -r 2a13fc138cfa -r 03aeec329490 patches/icedtea-sparc64-linux.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sparc64-linux.patch Mon Jun 16 20:04:22 2008 +0100
@@ -0,0 +1,93 @@
+diff -up openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD openjdk/hotspot/build/linux/makefiles/sparcv9.make
+--- openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD 2008-05-29 15:48:44.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/sparcv9.make 2008-05-29 15:48:39.000000000 -0400
+@@ -0,0 +1,27 @@
++#
++# Copyright 1999-2005 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.
++#
++#
++
++# TLS helper, assembled from .s file
++# Not included in includeDB because it has no dependencies
++Obj_Files += linux_sparc.o
+diff -up openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
+--- openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD 2008-05-29 16:25:10.000000000 -0400
++++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp 2008-05-29 16:32:11.000000000 -0400
+@@ -225,7 +225,7 @@ LIR_Address* LIRGenerator::emit_array_ad
+
+ void LIRGenerator::increment_counter(address counter, int step) {
+ LIR_Opr pointer = new_register(T_INT);
+- __ move(LIR_OprFact::intConst((int)counter), pointer);
++ __ move(LIR_OprFact::intConst((int)*counter), pointer);
+ LIR_Address* addr = new LIR_Address(pointer, 0, T_INT);
+ increment_counter(addr, step);
+ }
+@@ -1106,20 +1106,12 @@ void LIRGenerator::trace_block_entry(Blo
+
+ void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address,
+ CodeEmitInfo* info) {
+-#ifdef _LP64
+- __ store_mem_reg(value, address, info);
+-#else
+ __ volatile_store_mem_reg(value, address, info);
+-#endif
+ }
+
+ void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result,
+ CodeEmitInfo* info) {
+-#ifdef _LP64
+- __ load_mem_reg(address, result, info);
+-#else
+ __ volatile_load_mem_reg(address, result, info);
+-#endif
+ }
+
+
+diff -up openjdk/hotspot/build/linux/makefiles/defs.make.BAD openjdk/hotspot/build/linux/makefiles/defs.make
+--- openjdk/hotspot/build/linux/makefiles/defs.make.BAD 2008-05-30 07:03:37.000000000 -0400
++++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-05-30 07:03:45.000000000 -0400
+@@ -58,8 +58,8 @@ ifeq ($(ARCH), ia64)
+ HS_ARCH = ia64
+ endif
+
+-# sparc
+-ifneq (,$(filter $(ARCH), sparc sparc64))
++# sparc64
++ifeq ($(ARCH), sparc64)
+ ifeq ($(ARCH_DATA_MODEL), 64)
+ ARCH_DATA_MODEL = 64
+ MAKE_ARGS += LP64=1
+@@ -73,6 +73,14 @@ ifneq (,$(filter $(ARCH), sparc sparc64)
+ HS_ARCH = sparc
+ endif
+
++# sparc
++ifeq ($(ARCH), sparc)
++ ARCH_DATA_MODEL = 32
++ PLATFORM = linux-sparc
++ VM_PLATFORM = linux_sparc
++ HS_ARCH = sparc
++endif
++
+ # x86_64
+ ifeq ($(ARCH), x86_64)
+ ifeq ($(ARCH_DATA_MODEL), 64)
More information about the distro-pkg-dev
mailing list