rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

Accepting request 227348 from openSUSE:Factory:PowerPC

Browse Source 
Build fixes for ppc64 and ppc64le

OBS-URL: https://build.opensuse.org/request/show/227348
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=374
This commit is contained in:
Wolfgang Rosenauer 2014-03-25 08:26:07 +00:00 committed by Git OBS Bridge
parent 98c325ede9
commit 27336c8295
4 changed files with 77 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MozillaFirefox.changes
View File

@ -1,4 +1,18 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 24 16:18:44 UTC 2014 - dvaleev@suse.com
- Add patch for bmo#973977
- added patches:
* mozilla-ppc64-xpcom.patch
-------------------------------------------------------------------
Mon Mar 24 14:29:12 UTC 2014 - dvaleev@suse.com
- Refresh mozilla-ppc64le-xpcom.patch patch
- modified patches:
* mozilla-ppc64le-xpcom.patch
-------------------------------------------------------------------
Fri Mar 21 19:01:42 UTC 2014 - dvaleev@suse.com Fri Mar 21 19:01:42 UTC 2014 - dvaleev@suse.com
- Adapt mozilla-ppc64le-xpcom.patch to Mozilla > 24.0 build systm - Adapt mozilla-ppc64le-xpcom.patch to Mozilla > 24.0 build systm

2
MozillaFirefox.spec
View File

@ -112,6 +112,7 @@ Patch17: mozilla-ppc64le-libffi.patch
Patch18: mozilla-ppc64le-mfbt.patch Patch18: mozilla-ppc64le-mfbt.patch
Patch19: mozilla-ppc64le-webrtc.patch Patch19: mozilla-ppc64le-webrtc.patch
Patch20: mozilla-ppc64le-xpcom.patch Patch20: mozilla-ppc64le-xpcom.patch
Patch21: mozilla-ppc64-xpcom.patch
# Firefox/browser # Firefox/browser
Patch30: firefox-browser-css.patch Patch30: firefox-browser-css.patch
Patch31: firefox-kde.patch Patch31: firefox-kde.patch
@ -257,6 +258,7 @@ cd $RPM_BUILD_DIR/mozilla
%patch18 -p1 %patch18 -p1
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1
# #
%patch30 -p1 %patch30 -p1
%patch31 -p1 %patch31 -p1

16
mozilla-ppc64-xpcom.patch Normal file
View File

@ -0,0 +1,16 @@
Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
===================================================================
--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
@@ -41,6 +41,11 @@ SharedStub:
.section ".text"
.align 2
.globl SharedStub
+ # Make the symbol hidden so that the branch from the stub does
+ # not go via a PLT. This is not only better for performance,
+ # but may be necessary to avoid linker errors since there is
+ # no place to restore the TOC register in a sibling call.
+ .hidden SharedStub
.section ".opd","aw"
.align 3

196
mozilla-ppc64le-xpcom.patch
View File

@ -3,42 +3,32 @@
# User Ulrich Weigand <uweigand@de.ibm.com> # User Ulrich Weigand <uweigand@de.ibm.com>
Bug 976648 - powerpc64le-linux support - xptcall port Bug 976648 - powerpc64le-linux support - xptcall port
diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build Index: mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
--- a/xpcom/reflect/xptcall/src/md/unix/moz.build ===================================================================
+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/moz.build
@@ -228,16 +228,23 @@ if CONFIG['OS_TEST'] == 'powerpc64': +++ mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
@@ -224,12 +224,12 @@ if CONFIG['OS_TEST'] == 'powerpc':
'xptcstubs_ppc_linux.cpp',
]
-if CONFIG['OS_TEST'] == 'powerpc64':
+if CONFIG['OS_TEST'] in ('powerpc64', 'powerpc64le'):
if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'): if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'):
SOURCES += [ SOURCES += [
'xptcinvoke_asm_ppc64_linux.s', - 'xptcinvoke_asm_ppc64_linux.s',
+ 'xptcinvoke_asm_ppc64_linux.S',
'xptcinvoke_ppc64_linux.cpp', 'xptcinvoke_ppc64_linux.cpp',
'xptcstubs_asm_ppc64_linux.s', - 'xptcstubs_asm_ppc64_linux.s',
+ 'xptcstubs_asm_ppc64_linux.S',
'xptcstubs_ppc64_linux.cpp', 'xptcstubs_ppc64_linux.cpp',
] ]
+if CONFIG['OS_TEST'] == 'powerpc64le': diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S
+ if CONFIG['OS_ARCH'] == 'Linux': rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
+ SOURCES += [ rename to xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S
+ 'xptcinvoke_ppc64_linux.cpp',
+ 'xptcstubs_ppc64_linux.cpp',
+ ]
+
if CONFIG['OS_TEST'] in ('macppc', 'bebox', 'ofppc', 'prep', 'amigappc'):
if CONFIG['OS_ARCH'] == 'NetBSD':
SOURCES += [
'xptcinvoke_asm_ppc_netbsd.s',
'xptcinvoke_ppc_netbsd.cpp',
'xptcstubs_asm_ppc_netbsd.s',
'xptcstubs_ppc_netbsd.cpp',
]
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s --- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s +++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S
@@ -12,90 +12,121 @@ @@ -17,12 +17,38 @@
.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29 .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
.set f30,30; .set f31,31 .set f30,30; .set f31,31
@ -77,11 +67,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
.section ".toc","aw" .section ".toc","aw"
.section ".text" .section ".text"
.align 2 .align 2
.globl NS_InvokeByIndex @@ -34,6 +60,7 @@ NS_InvokeByIndex:
.section ".opd","aw"
.align 3
NS_InvokeByIndex:
.quad .NS_InvokeByIndex,.TOC.@tocbase
.previous .previous
.type NS_InvokeByIndex,@function .type NS_InvokeByIndex,@function
.NS_InvokeByIndex: .NS_InvokeByIndex:
@ -89,16 +75,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
mflr 0 mflr 0
std 0,16(r1) std 0,16(r1)
std r29,-24(r1) @@ -50,13 +77,12 @@ NS_InvokeByIndex:
std r30,-16(r1)
std r31,-8(r1)
mr r29,r3 # Save 'that' in r29
mr r30,r4 # Save 'methodIndex' in r30
mr r31,r1 # Save old frame
# Allocate stack frame with space for params. Since at least the
# first 7 parameters (not including 'that') will be in registers,
# we don't actually need stack space for those. We must ensure # we don't actually need stack space for those. We must ensure
# that the stack remains 16-byte aligned. # that the stack remains 16-byte aligned.
# #
@ -116,10 +93,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
rldicr r7,r7,3,59 # multiply by 8 and mask with ~15 rldicr r7,r7,3,59 # multiply by 8 and mask with ~15
neg r7,r7 neg r7,r7
stdux r1,r1,r7 stdux r1,r1,r7
@@ -67,12 +93,13 @@ NS_InvokeByIndex:
# Call invoke_copy_to_stack(uint64_t* gpregs, double* fpregs,
# uint32_t paramCount, nsXPTCVariant* s,
# uint64_t* d)) # uint64_t* d))
# r5, r6 are passed through intact (paramCount, params) # r5, r6 are passed through intact (paramCount, params)
@ -135,10 +109,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
bl invoke_copy_to_stack bl invoke_copy_to_stack
nop nop
# Set up to invoke function @@ -83,14 +110,18 @@ NS_InvokeByIndex:
ld r9,0(r29) # vtable (r29 is 'that')
mr r3,r29 # self is first arg, obviously
sldi r30,r30,3 # Find function descriptor sldi r30,r30,3 # Find function descriptor
add r9,r9,r30 add r9,r9,r30
@ -162,17 +133,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
# Load FP and GP registers as required # Load FP and GP registers as required
ld r4, -(23*8)(r31) ld r4, -(23*8)(r31)
ld r5, -(22*8)(r31) @@ -117,7 +148,7 @@ NS_InvokeByIndex:
ld r6, -(21*8)(r31)
ld r7, -(20*8)(r31)
ld r8, -(19*8)(r31)
ld r9, -(18*8)(r31)
@@ -112,21 +143,25 @@ NS_InvokeByIndex:
lfd f9, -(8*8)(r31)
lfd f10, -(7*8)(r31)
lfd f11, -(6*8)(r31)
lfd f12, -(5*8)(r31)
lfd f13, -(4*8)(r31)
bctrl # Do it bctrl # Do it
@ -181,8 +142,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
ld r1,0(r1) # Revert stack frame ld r1,0(r1) # Revert stack frame
ld 0,16(r1) # Reload lr ld 0,16(r1) # Reload lr
ld 29,-24(r1) # Restore NVGPRS ld 29,-24(r1) # Restore NVGPRS
ld 30,-16(r1) @@ -126,7 +157,11 @@ NS_InvokeByIndex:
ld 31,-8(r1)
mtlr 0 mtlr 0
blr blr
@ -194,15 +154,11 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
# Magic indicating no need for an executable stack # Magic indicating no need for an executable stack
.section .note.GNU-stack, "", @progbits ; .previous .section .note.GNU-stack, "", @progbits ; .previous
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp ===================================================================
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
@@ -69,17 +69,19 @@ invoke_copy_to_stack(uint64_t* gpregs, +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
else @@ -74,7 +74,9 @@ invoke_copy_to_stack(uint64_t* gpregs,
*(double *)d = s->val.d;
}
else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
if (i < FPR_COUNT) {
fpregs[i] = s->val.f; // if passed in registers, floats are promoted to doubles fpregs[i] = s->val.f; // if passed in registers, floats are promoted to doubles
} else { } else {
float *p = (float *)d; float *p = (float *)d;
@ -212,20 +168,12 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp b/xpco
*p = s->val.f; *p = s->val.f;
} }
} }
else { diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
if (i < GPR_COUNT) rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
gpregs[i] = tempu64; rename to xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
else
*d = tempu64;
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s --- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s +++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
@@ -12,28 +12,50 @@ @@ -17,6 +17,27 @@
.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29 .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
.set f30,30; .set f31,31 .set f30,30; .set f31,31
@ -253,12 +201,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpc
.section ".text" .section ".text"
.align 2 .align 2
.globl SharedStub .globl SharedStub
.section ".opd","aw" @@ -29,6 +50,7 @@ SharedStub:
.align 3
SharedStub:
.quad .SharedStub,.TOC.@tocbase
.previous
.type SharedStub,@function .type SharedStub,@function
.SharedStub: .SharedStub:
@ -266,17 +209,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpc
mflr r0 mflr r0
std r4, -56(r1) # Save all GPRS std r4, -56(r1) # Save all GPRS
std r5, -48(r1) @@ -55,7 +77,7 @@ SharedStub:
std r6, -40(r1)
std r7, -32(r1)
std r8, -24(r1)
std r9, -16(r1)
@@ -50,17 +72,17 @@ SharedStub:
stfd f5, -128(r1)
stfd f4, -136(r1)
stfd f3, -144(r1)
stfd f2, -152(r1)
stfd f1, -160(r1)
subi r6,r1,56 # r6 --> gprData subi r6,r1,56 # r6 --> gprData
subi r7,r1,160 # r7 --> fprData subi r7,r1,160 # r7 --> fprData
@ -285,17 +218,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpc
std r0, 16(r1) std r0, 16(r1)
stdu r1,-288(r1) @@ -75,7 +97,11 @@ SharedStub:
# r3 has the 'self' pointer
# already
mr r4,r11 # r4 is methodIndex selector,
@@ -70,12 +92,16 @@ SharedStub:
bl PrepareAndDispatch
nop
ld 1,0(r1) # restore stack
ld r0,16(r1) # restore LR
mtlr r0 mtlr r0
blr blr
@ -307,15 +230,11 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpc
# Magic indicating no need for an executable stack # Magic indicating no need for an executable stack
.section .note.GNU-stack, "", @progbits ; .previous .section .note.GNU-stack, "", @progbits ; .previous
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp ===================================================================
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
@@ -78,17 +78,19 @@ PrepareAndDispatch(nsXPTCStubBase* self, +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
dp->val.d = fprData[i]; @@ -83,7 +83,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
else
dp->val.d = *(double*) ap;
} else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
if (i < FPR_COUNT)
dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles
else { else {
float *p = (float *)ap; float *p = (float *)ap;
@ -325,17 +244,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom
dp->val.f = *p; dp->val.f = *p;
} }
} else { /* integer type or pointer */ } else { /* integer type or pointer */
if (i < GPR_COUNT) @@ -153,6 +155,43 @@ PrepareAndDispatch(nsXPTCStubBase* self,
tempu64 = gprData[i];
else
tempu64 = *ap;
@@ -148,16 +150,53 @@ PrepareAndDispatch(nsXPTCStubBase* self,
// Create names would be like:
// _ZN14nsXPTCStubBase5Stub1Ev
// _ZN14nsXPTCStubBase6Stub12Ev
// _ZN14nsXPTCStubBase7Stub123Ev
// _ZN14nsXPTCStubBase8Stub1234Ev
// etc. // etc.
// Use assembler directives to get the names right... // Use assembler directives to get the names right...
@ -379,17 +288,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom
# define STUB_ENTRY(n) \ # define STUB_ENTRY(n) \
__asm__ ( \ __asm__ ( \
".section \".toc\",\"aw\" \n\t" \ ".section \".toc\",\"aw\" \n\t" \
".section \".text\" \n\t" \ @@ -195,6 +234,7 @@ __asm__ (
".align 2 \n\t" \
".if "#n" < 10 \n\t" \
".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
".section \".opd\",\"aw\" \n\t" \
@@ -190,16 +229,17 @@ PrepareAndDispatch(nsXPTCStubBase* self,
\
".else \n\t" \
".err \"stub number "#n" >= 1000 not yet supported\"\n" \
".endif \n\t" \
\
"li 11,"#n" \n\t" \ "li 11,"#n" \n\t" \
"b SharedStub \n" \ "b SharedStub \n" \
); );
@ -397,8 +296,3 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom
#define SENTINEL_ENTRY(n) \ #define SENTINEL_ENTRY(n) \
nsresult nsXPTCStubBase::Sentinel##n() \ nsresult nsXPTCStubBase::Sentinel##n() \
{ \
NS_ERROR("nsXPTCStubBase::Sentinel called"); \
return NS_ERROR_NOT_IMPLEMENTED; \
}