| 1 |
armin76 07/11/29 16:44:58 |
| 2 |
|
| 3 |
Modified: 004_mozilla-hppa.patch |
| 4 |
Log: |
| 5 |
Fix patch to fix bug #180870 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.2 src/patchsets/seamonkey/1.1.5/004_mozilla-hppa.patch |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/seamonkey/1.1.5/004_mozilla-hppa.patch?rev=1.2&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/seamonkey/1.1.5/004_mozilla-hppa.patch?rev=1.2&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/seamonkey/1.1.5/004_mozilla-hppa.patch?r1=1.1&r2=1.2 |
| 13 |
|
| 14 |
Index: 004_mozilla-hppa.patch |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/src/patchsets/seamonkey/1.1.5/004_mozilla-hppa.patch,v |
| 17 |
retrieving revision 1.1 |
| 18 |
retrieving revision 1.2 |
| 19 |
diff -u -r1.1 -r1.2 |
| 20 |
--- 004_mozilla-hppa.patch 20 Oct 2007 14:59:11 -0000 1.1 |
| 21 |
+++ 004_mozilla-hppa.patch 29 Nov 2007 16:44:57 -0000 1.2 |
| 22 |
@@ -1,7 +1,19 @@ |
| 23 |
-diff -uNr mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in |
| 24 |
---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-12-21 13:37:00.503842544 +0000 |
| 25 |
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-12-21 13:41:49.439917584 +0000 |
| 26 |
-@@ -167,6 +167,19 @@ |
| 27 |
+# Original patch just cleaned up, Author on original patch was Randolph Chung (tausq@××××××.org) |
| 28 |
+# Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=287150 |
| 29 |
+ |
| 30 |
+Index: xpcom/reflect/xptcall/src/md/unix/Makefile.in |
| 31 |
+=================================================================== |
| 32 |
+RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in,v |
| 33 |
+retrieving revision 1.92 |
| 34 |
+diff -u -B -u -8 -p -r1.92 Makefile.in |
| 35 |
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in 14 Dec 2006 19:13:43 -0000 1.92 |
| 36 |
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 3 Jan 2007 18:20:44 -0000 |
| 37 |
+@@ -185,16 +185,29 @@ CPPSRCS := xptcinvoke_ipf32.cpp xptcstu |
| 38 |
+ ASFILES := xptcstubs_asm_ipf32.s xptcinvoke_asm_ipf32.s |
| 39 |
+ endif |
| 40 |
+ |
| 41 |
+ # #18875 Building the CPP's (CXX) optimized causes a crash |
| 42 |
+ CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS)) |
| 43 |
endif |
| 44 |
endif |
| 45 |
|
| 46 |
@@ -21,10 +33,18 @@ |
| 47 |
###################################################################### |
| 48 |
# M68k |
| 49 |
###################################################################### |
| 50 |
-diff -uNr mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s |
| 51 |
---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s 1970-01-01 00:00:00.000000000 +0000 |
| 52 |
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s 2004-12-21 13:39:03.390160984 +0000 |
| 53 |
-@@ -0,0 +1,128 @@ |
| 54 |
+ # |
| 55 |
+ # NetBSD/m68k |
| 56 |
+ # |
| 57 |
+ ifeq ($(OS_ARCH),NetBSD) |
| 58 |
+ ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST))) |
| 59 |
+Index: xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s |
| 60 |
+=================================================================== |
| 61 |
+RCS file: xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s |
| 62 |
+diff -N xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s |
| 63 |
+--- /dev/null 1 Jan 1970 00:00:00 -0000 |
| 64 |
++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s 3 Jan 2007 18:20:44 -0000 |
| 65 |
+@@ -0,0 +1,102 @@ |
| 66 |
+ |
| 67 |
+ .LEVEL 1.1 |
| 68 |
+ .text |
| 69 |
@@ -33,9 +53,6 @@ |
| 70 |
+framesz: |
| 71 |
+ .equ 128 |
| 72 |
+ |
| 73 |
-+; XPTC_InvokeByIndex(nsISuppots* that, PRUint32 methodIndex, |
| 74 |
-+; PRUint32 paramCount, nsXPTCVariant* params); |
| 75 |
-+ |
| 76 |
+.globl XPTC_InvokeByIndex |
| 77 |
+ .type XPTC_InvokeByIndex, @function |
| 78 |
+ |
| 79 |
@@ -61,14 +78,6 @@ |
| 80 |
+ STW %r24,-44-framesz(%r30) ; |
| 81 |
+ STW %r23,-48-framesz(%r30) ; |
| 82 |
+ |
| 83 |
-+; B,L .+8,%r2 |
| 84 |
-+; ADDIL L'invoke_count_bytes-$PIC_pcrel$1+4,%r2,%r1 |
| 85 |
-+; ; LDO R'invoke_count_bytes-$PIC_pcrel$2+8(%r1),%r1 |
| 86 |
-+;$PIC_pcrel$1 |
| 87 |
-+; LDSID (%r1),%r31 |
| 88 |
-+;$PIC_pcrel$2 |
| 89 |
-+; MTSP %r31,%sr0 |
| 90 |
-+ |
| 91 |
+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26;out=28 |
| 92 |
+ BL invoke_count_bytes,%r31 |
| 93 |
+ COPY %r31,%r2 |
| 94 |
@@ -98,13 +107,6 @@ |
| 95 |
+ LDW -48-framesz(%r3),%r24 ; |
| 96 |
+ |
| 97 |
+ LDW -32(%r30),%r19 ; shared lib call destroys r19; reload |
| 98 |
-+; B,L .+8,%r2 |
| 99 |
-+; ADDIL L'invoke_copy_to_stack-$PIC_pcrel$3+4,%r2,%r1 |
| 100 |
-+; LDO R'invoke_copy_to_stack-$PIC_pcrel$4+8(%r1),%r1 |
| 101 |
-+;$PIC_pcrel$3 |
| 102 |
-+; LDSID (%r1),%r31 |
| 103 |
-+;$PIC_pcrel$4 |
| 104 |
-+; MTSP %r31,%sr0 |
| 105 |
+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR ;in=24,25,26 |
| 106 |
+ BL invoke_copy_to_stack,%r31 |
| 107 |
+ COPY %r31,%r2 |
| 108 |
@@ -127,17 +129,9 @@ |
| 109 |
+ LDW -36-framesz(%r3),%r20 ; load vtable addr |
| 110 |
+ LDW -40-framesz(%r3),%r28 ; load index |
| 111 |
+ LDW 0(%r20),%r20 ; follow vtable |
| 112 |
-+; LDO 0(%r20),%r20 ; offset vtable by 16 bytes (g++: 8, aCC: 16) |
| 113 |
+ SH2ADDL %r28,%r20,%r28 ; add 4*index to vtable entry |
| 114 |
+ LDW 0(%r28),%r22 ; load vtable entry |
| 115 |
+ |
| 116 |
-+; B,L .+8,%r2 |
| 117 |
-+; ADDIL L'$$dyncall_external-$PIC_pcrel$5+4,%r2,%r1 |
| 118 |
-+; LDO R'$$dyncall_external-$PIC_pcrel$6+8(%r1),%r1 |
| 119 |
-+;$PIC_pcrel$5 |
| 120 |
-+; LDSID (%r1),%r31 |
| 121 |
-+;$PIC_pcrel$6 |
| 122 |
-+; MTSP %r31,%sr0 |
| 123 |
+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=22-26;out=28; |
| 124 |
+ BL $$dyncall,%r31 |
| 125 |
+ COPY %r31,%r2 |
| 126 |
@@ -153,10 +147,13 @@ |
| 127 |
+ .PROCEND ;in=23,24,25,26; |
| 128 |
+ .SIZE XPTC_InvokeByIndex, .-XPTC_InvokeByIndex |
| 129 |
+ |
| 130 |
-diff -uNr mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s |
| 131 |
---- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s 1970-01-01 00:00:00.000000000 +0000 |
| 132 |
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s 2004-12-21 13:39:03.392160680 +0000 |
| 133 |
-@@ -0,0 +1,73 @@ |
| 134 |
+Index: xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s |
| 135 |
+=================================================================== |
| 136 |
+RCS file: xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s |
| 137 |
+diff -N xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s |
| 138 |
+--- /dev/null 1 Jan 1970 00:00:00 -0000 |
| 139 |
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s 3 Jan 2007 18:20:44 -0000 |
| 140 |
+@@ -0,0 +1,66 @@ |
| 141 |
+ .LEVEL 1.1 |
| 142 |
+ .TEXT |
| 143 |
+ .ALIGN 4 |
| 144 |
@@ -205,13 +202,6 @@ |
| 145 |
+ LDO -40-curframesz-lastframesz(%r30),%r24 ; normal args is arg2 |
| 146 |
+ LDO -80(%r30),%r23 ; floating args is arg3 |
| 147 |
+ |
| 148 |
-+; BL .+8,%r2 |
| 149 |
-+; ADDIL L'PrepareAndDispatch-$PIC_pcrel$0+4,%r2 |
| 150 |
-+; LDO R'PrepareAndDispatch-$PIC_pcrel$1+8(%r1),%r1 |
| 151 |
-+;$PIC_pcrel$0 |
| 152 |
-+; LDSID (%r1),%r31 |
| 153 |
-+;$PIC_pcrel$1 |
| 154 |
-+; MTSP %r31,%sr0 |
| 155 |
+ .CALL ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR ;in=23-26;out=28; |
| 156 |
+ BL PrepareAndDispatch, %r31 |
| 157 |
+ COPY %r31,%r2 |
| 158 |
|
| 159 |
|
| 160 |
|
| 161 |
-- |
| 162 |
gentoo-commits@g.o mailing list |
Archives