rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk-hotspot-ppc.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.56, 1.57
Lillian Angel
langel at fedoraproject.org
Mon Sep 8 18:47:32 UTC 2008
- Previous message: [pkgdb] cryptsetup-luks ownership updated
- Next message: rpms/kernel/F-9 patch-2.6.26.5.bz2.sign, NONE, 1.1 .cvsignore, 1.825, 1.826 kernel.spec, 1.757, 1.758 sources, 1.786, 1.787 upstream, 1.705, 1.706 patch-2.6.26.3.bz2.sign, 1.1, NONE patch-2.6.26.4-rc1, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30285
Modified Files:
java-1.6.0-openjdk.spec
Added Files:
java-1.6.0-openjdk-hotspot-ppc.patch
Log Message:
* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
- Added hotspot patch for ppc.
java-1.6.0-openjdk-hotspot-ppc.patch:
--- NEW FILE java-1.6.0-openjdk-hotspot-ppc.patch ---
--- openjdk/hotspot/src/share/vm/opto/cfgnode.cpp.orig 2008-06-08 15:15:19.000000000 +0200
+++ openjdk/hotspot/src/share/vm/opto/cfgnode.cpp 2008-06-08 15:16:06.000000000 +0200
@@ -1551,45 +1551,6 @@
if (opt != NULL) return opt;
}
- if (in(1) != NULL && in(1)->Opcode() == Op_AddP && can_reshape) {
- // Try to undo Phi of AddP:
- // (Phi (AddP base base y) (AddP base2 base2 y))
- // becomes:
- // newbase := (Phi base base2)
- // (AddP newbase newbase y)
- //
- // This occurs as a result of unsuccessful split_thru_phi and
- // interferes with taking advantage of addressing modes. See the
- // clone_shift_expressions code in matcher.cpp
- Node* addp = in(1);
- const Type* type = addp->in(AddPNode::Base)->bottom_type();
- Node* y = addp->in(AddPNode::Offset);
- if (y != NULL && addp->in(AddPNode::Base) == addp->in(AddPNode::Address)) {
- // make sure that all the inputs are similar to the first one,
- // i.e. AddP with base == address and same offset as first AddP
- bool doit = true;
- for (uint i = 2; i < req(); i++) {
- if (in(i) == NULL ||
- in(i)->Opcode() != Op_AddP ||
- in(i)->in(AddPNode::Base) != in(i)->in(AddPNode::Address) ||
- in(i)->in(AddPNode::Offset) != y) {
- doit = false;
- break;
- }
- // Accumulate type for resulting Phi
- type = type->meet(in(i)->in(AddPNode::Base)->bottom_type());
- }
- if (doit) {
- Node* base = new (phase->C, in(0)->req()) PhiNode(in(0), type, NULL);
- for (uint i = 1; i < req(); i++) {
- base->init_req(i, in(i)->in(AddPNode::Base));
- }
- phase->is_IterGVN()->register_new_node_with_optimizer(base);
- return new (phase->C, 4) AddPNode(base, base, y);
- }
- }
- }
-
// Split phis through memory merges, so that the memory merges will go away.
// Piggy-back this transformation on the search for a unique input....
// It will be as if the merged memory is the unique value of the phi.
Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- java-1.6.0-openjdk.spec 8 Sep 2008 18:10:21 -0000 1.56
+++ java-1.6.0-openjdk.spec 8 Sep 2008 18:47:01 -0000 1.57
@@ -175,6 +175,8 @@
Patch9: java-1.6.0-openjdk-6661918.patch
Patch10: java-1.6.0-openjdk-6685178.patch
Patch11: java-1.6.0-openjdk-hotspot.patch
+Patch12: java-1.6.0-openjdk-hotspot-ppc.patch
+Patch12: java-1.6.0-openjdk-hotspot-ppc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -393,9 +395,12 @@
patch -l -p0 < %{PATCH8}
%ifarch %{jit_arches}
patch -l -p0 < %{PATCH9}
+patch -l -p0 < %{PATCH11}
%endif
patch -l -p0 < %{PATCH10}
-patch -l -p0 < %{PATCH11}
+%ifnarch %{jit_arches}
+patch -l -p0 < %{PATCH12}
+%endif
make
# Build cacerts file.
@@ -931,6 +936,9 @@
%changelog
* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
+- Added hotspot patch for ppc.
+
+* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.18.b09
- Added hotspot patch (Patch11) to fix eclipse crashing bug.
- Resolves: rhbz#460205
- Previous message: [pkgdb] cryptsetup-luks ownership updated
- Next message: rpms/kernel/F-9 patch-2.6.26.5.bz2.sign, NONE, 1.1 .cvsignore, 1.825, 1.826 kernel.spec, 1.757, 1.758 sources, 1.786, 1.787 upstream, 1.705, 1.706 patch-2.6.26.3.bz2.sign, 1.1, NONE patch-2.6.26.4-rc1, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list