rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-sparc-fixes.patch, NONE, 1.1 java-1.6.0-openjdk-sparc-hotspot.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.107, 1.108
Dennis Gilmore
ausil at fedoraproject.org
Wed Feb 25 21:19:34 UTC 2009
Author: ausil
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3613
Modified Files:
java-1.6.0-openjdk.spec
Added Files:
java-1.6.0-openjdk-sparc-fixes.patch
java-1.6.0-openjdk-sparc-hotspot.patch
Log Message:
add in propper sparc arch handling it is a jit arch
java-1.6.0-openjdk-sparc-fixes.patch:
--- NEW FILE java-1.6.0-openjdk-sparc-fixes.patch ---
diff -Nur icedtea6-1.4-orig/HACKING icedtea6-1.4/HACKING
--- icedtea6-1.4-orig/HACKING 2009-01-20 10:35:02.000000000 -0600
+++ icedtea6-1.4/HACKING 2009-02-11 12:17:09.000000000 -0600
@@ -45,7 +45,6 @@
* icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones.
* 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.
* icedtea-ssl.patch: Add casts to AlgorithmParameterSpec in sun.security.ssl package.
* icedtea-static-libstdc++.patch: Don't use static C++ on PPC64.
* icedtea-sunsrc.patch: Remove service property files from TOOLS list.
diff -Nur icedtea6-1.4-orig/Makefile.am icedtea6-1.4/Makefile.am
--- icedtea6-1.4-orig/Makefile.am 2009-01-20 10:33:30.000000000 -0600
+++ icedtea6-1.4/Makefile.am 2009-02-11 12:16:07.000000000 -0600
@@ -580,8 +580,7 @@
ICEDTEA_PATCHES += \
patches/hotspot/$(HSBUILD)/icedtea-sparc64-linux.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch
+ patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -Nur icedtea6-1.4-orig/Makefile.in icedtea6-1.4/Makefile.in
--- icedtea6-1.4-orig/Makefile.in 2009-01-26 08:01:23.000000000 -0600
+++ icedtea6-1.4/Makefile.in 2009-02-11 11:19:07.000000000 -0600
@@ -589,7 +589,6 @@
$(am__append_12) \
patches/hotspot/$(HSBUILD)/icedtea-sparc64-linux.patch \
patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \
$(am__append_13) $(am__append_14) $(am__append_15) \
$(am__append_16) $(DISTRIBUTION_PATCHES) \
patches/icedtea-demo-swingapplet.patch \
diff -Nur icedtea6-1.4-orig/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch icedtea6-1.4/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch
--- icedtea6-1.4-orig/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch 2008-12-15 11:16:15.000000000 -0600
+++ icedtea6-1.4/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch 1969-12-31 18:00:00.000000000 -0600
@@ -1,21 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2008-08-04 08:40:18.000000000 +0100
-+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2008-08-09 01:29:51.000000000 +0100
-@@ -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
-
- void MacroAssembler::read_ccr_trap(Register ccr_save) {
- // No implementation
diff -Nur icedtea6-1.4-orig/patches/hotspot/original/icedtea-sparc-trapsfix.patch icedtea6-1.4/patches/hotspot/original/icedtea-sparc-trapsfix.patch
--- icedtea6-1.4-orig/patches/hotspot/original/icedtea-sparc-trapsfix.patch 2008-12-15 11:16:15.000000000 -0600
+++ icedtea6-1.4/patches/hotspot/original/icedtea-sparc-trapsfix.patch 1969-12-31 18:00:00.000000000 -0600
@@ -1,21 +0,0 @@
-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 -Nur icedtea6-1.4-orig/patches/icedtea-sparc.patch icedtea6-1.4/patches/icedtea-sparc.patch
--- icedtea6-1.4-orig/patches/icedtea-sparc.patch 2008-12-15 11:16:15.000000000 -0600
+++ icedtea6-1.4/patches/icedtea-sparc.patch 2009-02-11 11:21:05.000000000 -0600
@@ -67,7 +67,7 @@
+#include "incls/_precompiled.incl"
+#include "incls/_assembler_linux_sparc.cpp.incl"
+
-+#include <asm-sparc/traps.h>
++#include <asm/traps.h>
+
+bool MacroAssembler::needs_explicit_null_check(intptr_t offset) {
+ // Since the linux kernel resides at the low end of
java-1.6.0-openjdk-sparc-hotspot.patch:
--- NEW FILE java-1.6.0-openjdk-sparc-hotspot.patch ---
--- ./openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.orig 2009-02-11 19:26:14.000000000 -0500
+++ ./openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2009-02-11 19:26:27.000000000 -0500
@@ -25,7 +25,7 @@
#include "incls/_precompiled.incl"
#include "incls/_assembler_linux_sparc.cpp.incl"
-#include <asm-sparc/traps.h>
+#include <asm/traps.h>
void MacroAssembler::read_ccr_trap(Register ccr_save) {
// No implementation
Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- java-1.6.0-openjdk.spec 25 Feb 2009 18:47:46 -0000 1.107
+++ java-1.6.0-openjdk.spec 25 Feb 2009 21:19:04 -0000 1.108
@@ -31,7 +31,7 @@
%define multilib_arches ppc64 sparc64 x86_64
-%define jit_arches %{ix86} x86_64
+%define jit_arches %{ix86} x86_64 sparcv9 sparc64
%ifarch %{ix86}
%define archbuild i586
@@ -41,6 +41,16 @@
%define archbuild amd64
%define archinstall amd64
%endif
+# 32 bit sparc, optimized for v9
+%ifarch sparcv9
+%define archbuild sparc
+%define archinstall sparc
+%endif
+# 64 bit sparc
+%ifarch sparc64
+%define archbuild sparcv9
+%define archinstall sparcv9
+%endif
%ifnarch %{jit_arches}
%define archbuild %{_arch}
%define archinstall %{_arch}
@@ -110,7 +120,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 12.%{openjdkver}%{?dist}
+Release: 13.%{openjdkver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -145,6 +155,8 @@
Patch3: java-1.6.0-openjdk-java-access-bridge-idlj.patch
Patch4: java-1.6.0-openjdk-java-access-bridge-security.patch
Patch5: java-1.6.0-openjdk-accessible-toolkit.patch
+Patch6: java-1.6.0-openjdk-sparc-fixes.patch
+Patch7: java-1.6.0-openjdk-sparc-hotspot.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -355,6 +367,7 @@
%setup -q -n icedtea6-%{icedteaver} -T -D -a 2
%patch0
%patch2
+%patch6 -p1
cp %{SOURCE4} .
cp %{SOURCE6} .
cp %{SOURCE7} .
@@ -379,6 +392,7 @@
make patch
patch -l -p0 < %{PATCH4}
patch -l -p0 < %{PATCH5}
+patch -l -p0 < %{PATCH7}
make
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -907,6 +921,10 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
%changelog
+* Wed Feb 25 2009 Dennis Gilmore <dennis at ausil.us> - 1:1.6.0-13.b14
+- fix sparc arch building asm-sparc has gone. we only have asm/ now
+- add sparc arches back to the jit arch list
+
* Wed Feb 25 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-12.b14
- Updated release.
- Updated icedteaver.
More information about the scm-commits
mailing list