forked from pool/MozillaThunderbird
Accepting request 211249 from openSUSE:Factory:PowerLE
- Add support for powerpc64le-linux. * ppc64le-support.patch: general support * libffi-ppc64le.patch: libffi backport * xpcom-ppc64le.patch: port xpcom OBS-URL: https://build.opensuse.org/request/show/211249 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=235
This commit is contained in:
Wolfgang Rosenauer
Git OBS Bridge
parent
f85086f38b
commit
47b36852f5
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 13 21:29:16 UTC 2013 - uweigand@de.ibm.com
|
||||||
|
|
||||||
|
- Add support for powerpc64le-linux.
|
||||||
|
* ppc64le-support.patch: general support
|
||||||
|
* libffi-ppc64le.patch: libffi backport
|
||||||
|
* xpcom-ppc64le.patch: port xpcom
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Dec 8 10:18:03 UTC 2013 - wr@rosenauer.org
|
Sun Dec 8 10:18:03 UTC 2013 - wr@rosenauer.org
|
||||||
|
|
||||||
|
|||||||
@ -82,6 +82,9 @@ Patch3: mozilla-nongnome-proxies.patch
|
|||||||
Patch4: mozilla-kde.patch
|
Patch4: mozilla-kde.patch
|
||||||
Patch5: mozilla-arm-disable-edsp.patch
|
Patch5: mozilla-arm-disable-edsp.patch
|
||||||
Patch7: mozilla-ppc.patch
|
Patch7: mozilla-ppc.patch
|
||||||
|
Patch8: libffi-ppc64le.patch
|
||||||
|
Patch9: xpcom-ppc64le.patch
|
||||||
|
Patch10: ppc64le-support.patch
|
||||||
# Thunderbird/mail
|
# Thunderbird/mail
|
||||||
Patch20: tb-ssldap.patch
|
Patch20: tb-ssldap.patch
|
||||||
Patch21: tb-develdirs.patch
|
Patch21: tb-develdirs.patch
|
||||||
@ -91,7 +94,7 @@ PreReq: coreutils fileutils textutils /bin/sh
|
|||||||
Recommends: libcanberra0
|
Recommends: libcanberra0
|
||||||
### build options
|
### build options
|
||||||
%define build_enigmail 1
|
%define build_enigmail 1
|
||||||
%ifnarch ppc ppc64 %arm
|
%ifnarch ppc ppc64 ppc64le %arm
|
||||||
%define crashreporter 1
|
%define crashreporter 1
|
||||||
%else
|
%else
|
||||||
%define crashreporter 0
|
%define crashreporter 0
|
||||||
@ -209,6 +212,9 @@ pushd mozilla
|
|||||||
%endif
|
%endif
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
|
%patch8 -p1
|
||||||
|
%patch9 -p1
|
||||||
|
%patch10 -p1
|
||||||
popd
|
popd
|
||||||
# comm-central patches
|
# comm-central patches
|
||||||
%patch20 -p1
|
%patch20 -p1
|
||||||
@ -237,7 +243,7 @@ export BUILD_OFFICIAL=1
|
|||||||
export MOZ_ESR=1
|
export MOZ_ESR=1
|
||||||
%endif
|
%endif
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
|
export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
|
||||||
%ifarch ppc64
|
%ifarch ppc64 ppc64le
|
||||||
export CFLAGS="$CFLAGS -mminimal-toc"
|
export CFLAGS="$CFLAGS -mminimal-toc"
|
||||||
%endif
|
%endif
|
||||||
export CXXFLAGS="$CFLAGS"
|
export CXXFLAGS="$CFLAGS"
|
||||||
|
|||||||
3750
libffi-ppc64le.patch
Normal file
3750
libffi-ppc64le.patch
Normal file
File diff suppressed because it is too large
Load Diff
159
ppc64le-support.patch
Normal file
159
ppc64le-support.patch
Normal file
@ -0,0 +1,159 @@
|
|||||||
|
Index: mozilla/configure.in
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/configure.in
|
||||||
|
+++ mozilla/configure.in
|
||||||
|
@@ -1084,7 +1084,7 @@ case "$OS_TEST" in
|
||||||
|
CPU_ARCH=x86
|
||||||
|
;;
|
||||||
|
|
||||||
|
-powerpc64 | ppc64)
|
||||||
|
+powerpc64 | ppc64 | powerpc64le | ppc64le)
|
||||||
|
CPU_ARCH=ppc64
|
||||||
|
;;
|
||||||
|
|
||||||
|
Index: mozilla/js/src/configure.in
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/js/src/configure.in
|
||||||
|
+++ mozilla/js/src/configure.in
|
||||||
|
@@ -915,7 +915,7 @@ case "$OS_TEST" in
|
||||||
|
CPU_ARCH=x86
|
||||||
|
;;
|
||||||
|
|
||||||
|
-powerpc64 | ppc64)
|
||||||
|
+powerpc64 | ppc64 | powerpc64le | ppc64le)
|
||||||
|
CPU_ARCH=ppc64
|
||||||
|
;;
|
||||||
|
|
||||||
|
Index: mozilla/mfbt/Endian.h
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/mfbt/Endian.h
|
||||||
|
+++ mozilla/mfbt/Endian.h
|
||||||
|
@@ -91,7 +91,7 @@
|
||||||
|
# else
|
||||||
|
# error "CPU type is unknown"
|
||||||
|
# endif
|
||||||
|
-#elif defined(__APPLE__)
|
||||||
|
+#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__)
|
||||||
|
# if __LITTLE_ENDIAN__
|
||||||
|
# define MOZ_LITTLE_ENDIAN 1
|
||||||
|
# elif __BIG_ENDIAN__
|
||||||
|
@@ -119,8 +119,7 @@
|
||||||
|
* cases.
|
||||||
|
*/
|
||||||
|
#elif defined(__sparc) || defined(__sparc__) || \
|
||||||
|
- defined(_POWER) || defined(__powerpc__) || \
|
||||||
|
- defined(__ppc__) || defined(__hppa) || \
|
||||||
|
+ defined(_POWER) || defined(__hppa) || \
|
||||||
|
defined(_MIPSEB) || defined(__ARMEB__) || \
|
||||||
|
defined(__s390__) || \
|
||||||
|
(defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \
|
||||||
|
Index: mozilla/js/src/jscpucfg.h
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/js/src/jscpucfg.h
|
||||||
|
+++ mozilla/js/src/jscpucfg.h
|
||||||
|
@@ -31,7 +31,7 @@
|
||||||
|
# define JS_BYTES_PER_WORD 4
|
||||||
|
# define JS_BITS_PER_WORD_LOG2 5
|
||||||
|
|
||||||
|
-#elif defined(__APPLE__)
|
||||||
|
+#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__)
|
||||||
|
# if __LITTLE_ENDIAN__
|
||||||
|
# define IS_LITTLE_ENDIAN 1
|
||||||
|
# undef IS_BIG_ENDIAN
|
||||||
|
@@ -93,8 +93,7 @@
|
||||||
|
# endif
|
||||||
|
|
||||||
|
#elif defined(__sparc) || defined(__sparc__) || \
|
||||||
|
- defined(_POWER) || defined(__powerpc__) || \
|
||||||
|
- defined(__ppc__) || defined(__hppa) || \
|
||||||
|
+ defined(_POWER) || defined(__hppa) || \
|
||||||
|
defined(_MIPSEB) || defined(_BIG_ENDIAN)
|
||||||
|
/* IA64 running HP-UX will have _BIG_ENDIAN defined.
|
||||||
|
* IA64 running Linux will have endian.h and be handled above.
|
||||||
|
Index: mozilla/js/src/assembler/wtf/Platform.h
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/js/src/assembler/wtf/Platform.h
|
||||||
|
+++ mozilla/js/src/assembler/wtf/Platform.h
|
||||||
|
@@ -165,16 +165,22 @@
|
||||||
|
|| defined(__POWERPC__) \
|
||||||
|
|| defined(_M_PPC) \
|
||||||
|
|| defined(__PPC)
|
||||||
|
+#if !defined(__ppc64__) && !defined(__PPC64__)
|
||||||
|
#define WTF_CPU_PPC 1
|
||||||
|
+#endif
|
||||||
|
+#if !defined(__LITTLE_ENDIAN__)
|
||||||
|
#define WTF_CPU_BIG_ENDIAN 1
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* WTF_CPU_PPC64 - PowerPC 64-bit */
|
||||||
|
#if defined(__ppc64__) \
|
||||||
|
|| defined(__PPC64__)
|
||||||
|
#define WTF_CPU_PPC64 1
|
||||||
|
+#if !defined(__LITTLE_ENDIAN__)
|
||||||
|
#define WTF_CPU_BIG_ENDIAN 1
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* WTF_CPU_SH4 - SuperH SH-4 */
|
||||||
|
#if defined(__SH4__)
|
||||||
|
Index: mozilla/nsprpub/pr/include/md/_linux.cfg
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/nsprpub/pr/include/md/_linux.cfg
|
||||||
|
+++ mozilla/nsprpub/pr/include/md/_linux.cfg
|
||||||
|
@@ -29,8 +29,13 @@
|
||||||
|
|
||||||
|
#ifdef __powerpc64__
|
||||||
|
|
||||||
|
+#ifdef __LITTLE_ENDIAN__
|
||||||
|
+#define IS_LITTLE_ENDIAN 1
|
||||||
|
+#undef IS_BIG_ENDIAN
|
||||||
|
+#else
|
||||||
|
#undef IS_LITTLE_ENDIAN
|
||||||
|
#define IS_BIG_ENDIAN 1
|
||||||
|
+#endif
|
||||||
|
#define IS_64
|
||||||
|
|
||||||
|
#define PR_BYTES_PER_BYTE 1
|
||||||
|
@@ -75,8 +80,13 @@
|
||||||
|
|
||||||
|
#elif defined(__powerpc__)
|
||||||
|
|
||||||
|
+#ifdef __LITTLE_ENDIAN__
|
||||||
|
+#define IS_LITTLE_ENDIAN 1
|
||||||
|
+#undef IS_BIG_ENDIAN
|
||||||
|
+#else
|
||||||
|
#undef IS_LITTLE_ENDIAN
|
||||||
|
#define IS_BIG_ENDIAN 1
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#define PR_BYTES_PER_BYTE 1
|
||||||
|
#define PR_BYTES_PER_SHORT 2
|
||||||
|
Index: mozilla/media/webrtc/trunk/webrtc/typedefs.h
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/media/webrtc/trunk/webrtc/typedefs.h
|
||||||
|
+++ mozilla/media/webrtc/trunk/webrtc/typedefs.h
|
||||||
|
@@ -52,13 +52,23 @@
|
||||||
|
#elif defined(__powerpc64__)
|
||||||
|
#define WEBRTC_ARCH_PPC64 1
|
||||||
|
#define WEBRTC_ARCH_64_BITS 1
|
||||||
|
+#ifdef __LITTLE_ENDIAN__
|
||||||
|
+#define WEBRTC_ARCH_LITTLE_ENDIAN
|
||||||
|
+#define WEBRTC_LITTLE_ENDIAN
|
||||||
|
+#else
|
||||||
|
#define WEBRTC_ARCH_BIG_ENDIAN
|
||||||
|
#define WEBRTC_BIG_ENDIAN
|
||||||
|
+#endif
|
||||||
|
#elif defined(__ppc__) || defined(__powerpc__)
|
||||||
|
#define WEBRTC_ARCH_PPC 1
|
||||||
|
#define WEBRTC_ARCH_32_BITS 1
|
||||||
|
+#ifdef __LITTLE_ENDIAN__
|
||||||
|
+#define WEBRTC_ARCH_LITTLE_ENDIAN
|
||||||
|
+#define WEBRTC_LITTLE_ENDIAN
|
||||||
|
+#else
|
||||||
|
#define WEBRTC_ARCH_BIG_ENDIAN
|
||||||
|
#define WEBRTC_BIG_ENDIAN
|
||||||
|
+#endif
|
||||||
|
#elif defined(__sparc64__)
|
||||||
|
#define WEBRTC_ARCH_SPARC 1
|
||||||
|
#define WEBRTC_ARCH_64_BITS 1
|
||||||
277
xpcom-ppc64le.patch
Normal file
277
xpcom-ppc64le.patch
Normal file
@ -0,0 +1,277 @@
|
|||||||
|
Index: mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/moz.build
|
||||||
|
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
|
||||||
|
@@ -198,6 +198,13 @@ if CONFIG['OS_TEST'] == 'powerpc64':
|
||||||
|
'xptcstubs_ppc64_linux.cpp',
|
||||||
|
]
|
||||||
|
|
||||||
|
+if CONFIG['OS_TEST'] == 'powerpc64le':
|
||||||
|
+ if CONFIG['OS_ARCH'] == 'Linux':
|
||||||
|
+ CPP_SOURCES += [
|
||||||
|
+ 'xptcinvoke_ppc64_linux.cpp',
|
||||||
|
+ 'xptcstubs_ppc64_linux.cpp',
|
||||||
|
+ ]
|
||||||
|
+
|
||||||
|
if CONFIG['OS_TEST'] in ('macppc', 'bebox', 'ofppc', 'prep', 'amigappc'):
|
||||||
|
if CONFIG['OS_ARCH'] == 'NetBSD':
|
||||||
|
CPP_SOURCES += [
|
||||||
|
Index: mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in
|
||||||
|
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
|
||||||
|
@@ -166,7 +166,7 @@ endif
|
||||||
|
#
|
||||||
|
# Linux/PPC64
|
||||||
|
#
|
||||||
|
-ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
|
||||||
|
+ifneq (,$(filter Linuxpowerpc64 Linuxpowerpc64le FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
|
||||||
|
ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
|
||||||
|
AS := $(CC) -c -x assembler-with-cpp
|
||||||
|
endif
|
||||||
|
Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
|
||||||
|
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
|
||||||
|
@@ -17,12 +17,29 @@
|
||||||
|
.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
|
||||||
|
.set f30,30; .set f31,31
|
||||||
|
|
||||||
|
+#if _CALL_ELF == 2
|
||||||
|
+#define STACK_TOC 28
|
||||||
|
+#define STACK_PARAMS 96
|
||||||
|
+#else
|
||||||
|
+#define STACK_TOC 40
|
||||||
|
+#define STACK_PARAMS 112
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#
|
||||||
|
# NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
|
||||||
|
# uint32_t paramCount, nsXPTCVariant* params)
|
||||||
|
#
|
||||||
|
|
||||||
|
+#if _CALL_ELF == 2
|
||||||
|
+ .section ".text"
|
||||||
|
+ .type NS_InvokeByIndex,@function
|
||||||
|
+ .globl NS_InvokeByIndex
|
||||||
|
+ .align 2
|
||||||
|
+NS_InvokeByIndex:
|
||||||
|
+0: addis 2,12,(.TOC.-0b)@ha
|
||||||
|
+ addi 2,2,(.TOC.-0b)@l
|
||||||
|
+ .localentry NS_InvokeByIndex,.-NS_InvokeByIndex
|
||||||
|
+#else
|
||||||
|
.section ".toc","aw"
|
||||||
|
.section ".text"
|
||||||
|
.align 2
|
||||||
|
@@ -34,6 +51,7 @@ NS_InvokeByIndex:
|
||||||
|
.previous
|
||||||
|
.type NS_InvokeByIndex,@function
|
||||||
|
.NS_InvokeByIndex:
|
||||||
|
+#endif
|
||||||
|
mflr 0
|
||||||
|
std 0,16(r1)
|
||||||
|
|
||||||
|
@@ -56,7 +74,7 @@ NS_InvokeByIndex:
|
||||||
|
# (-23*8).(-16*8).(-3*8)..(r31)
|
||||||
|
|
||||||
|
# +stack frame, -unused stack params, +regs storage, +1 for alignment
|
||||||
|
- addi r7,r5,((112/8)-7+7+13+3+1)
|
||||||
|
+ addi r7,r5,((STACK_PARAMS/8)-7+7+13+3+1)
|
||||||
|
rldicr r7,r7,3,59 # multiply by 8 and mask with ~15
|
||||||
|
neg r7,r7
|
||||||
|
stdux r1,r1,r7
|
||||||
|
@@ -72,7 +90,7 @@ NS_InvokeByIndex:
|
||||||
|
|
||||||
|
subi r3,r31,(23*8) # r3 --> GPRS
|
||||||
|
subi r4,r31,(16*8) # r4 --> FPRS
|
||||||
|
- addi r7,r1,112 # r7 --> params
|
||||||
|
+ addi r7,r1,STACK_PARAMS # r7 --> params
|
||||||
|
bl invoke_copy_to_stack
|
||||||
|
nop
|
||||||
|
|
||||||
|
@@ -83,14 +101,18 @@ NS_InvokeByIndex:
|
||||||
|
|
||||||
|
sldi r30,r30,3 # Find function descriptor
|
||||||
|
add r9,r9,r30
|
||||||
|
- ld r9,0(r9)
|
||||||
|
+ ld r12,0(r9)
|
||||||
|
|
||||||
|
- ld r0,0(r9) # Actual address from fd.
|
||||||
|
- std r2,40(r1) # Save r2 (TOC pointer)
|
||||||
|
+ std r2,STACK_TOC(r1) # Save r2 (TOC pointer)
|
||||||
|
|
||||||
|
+#if _CALL_ELF == 2
|
||||||
|
+ mtctr r12
|
||||||
|
+#else
|
||||||
|
+ ld r0,0(r12) # Actual address from fd.
|
||||||
|
mtctr 0
|
||||||
|
- ld r11,16(r9) # Environment pointer from fd.
|
||||||
|
- ld r2,8(r9) # TOC pointer from fd.
|
||||||
|
+ ld r11,16(r12) # Environment pointer from fd.
|
||||||
|
+ ld r2,8(r12) # TOC pointer from fd.
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
# Load FP and GP registers as required
|
||||||
|
ld r4, -(23*8)(r31)
|
||||||
|
@@ -117,7 +139,7 @@ NS_InvokeByIndex:
|
||||||
|
|
||||||
|
bctrl # Do it
|
||||||
|
|
||||||
|
- ld r2,40(r1) # Load our own TOC pointer
|
||||||
|
+ ld r2,STACK_TOC(r1) # Load our own TOC pointer
|
||||||
|
ld r1,0(r1) # Revert stack frame
|
||||||
|
ld 0,16(r1) # Reload lr
|
||||||
|
ld 29,-24(r1) # Restore NVGPRS
|
||||||
|
@@ -126,7 +148,11 @@ NS_InvokeByIndex:
|
||||||
|
mtlr 0
|
||||||
|
blr
|
||||||
|
|
||||||
|
+#if _CALL_ELF == 2
|
||||||
|
+ .size NS_InvokeByIndex,.-NS_InvokeByIndex
|
||||||
|
+#else
|
||||||
|
.size NS_InvokeByIndex,.-.NS_InvokeByIndex
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
# Magic indicating no need for an executable stack
|
||||||
|
.section .note.GNU-stack, "", @progbits ; .previous
|
||||||
|
Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
|
||||||
|
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
|
||||||
|
@@ -74,7 +74,9 @@ invoke_copy_to_stack(uint64_t* gpregs,
|
||||||
|
fpregs[i] = s->val.f; // if passed in registers, floats are promoted to doubles
|
||||||
|
} else {
|
||||||
|
float *p = (float *)d;
|
||||||
|
+#ifndef __LITTLE_ENDIAN__
|
||||||
|
p++;
|
||||||
|
+#endif
|
||||||
|
*p = s->val.f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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
|
||||||
|
@@ -17,6 +17,27 @@
|
||||||
|
.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
|
||||||
|
.set f30,30; .set f31,31
|
||||||
|
|
||||||
|
+#if _CALL_ELF == 2
|
||||||
|
+#define STACK_PARAMS 96
|
||||||
|
+#else
|
||||||
|
+#define STACK_PARAMS 112
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#if _CALL_ELF == 2
|
||||||
|
+ .section ".text"
|
||||||
|
+ .type SharedStub,@function
|
||||||
|
+ .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
|
||||||
|
+ .align 2
|
||||||
|
+SharedStub:
|
||||||
|
+0: addis 2,12,(.TOC.-0b)@ha
|
||||||
|
+ addi 2,2,(.TOC.-0b)@l
|
||||||
|
+ .localentry SharedStub,.-SharedStub
|
||||||
|
+#else
|
||||||
|
.section ".text"
|
||||||
|
.align 2
|
||||||
|
.globl SharedStub
|
||||||
|
@@ -29,6 +50,7 @@ SharedStub:
|
||||||
|
.type SharedStub,@function
|
||||||
|
|
||||||
|
.SharedStub:
|
||||||
|
+#endif
|
||||||
|
mflr r0
|
||||||
|
|
||||||
|
std r4, -56(r1) # Save all GPRS
|
||||||
|
@@ -55,7 +77,7 @@ SharedStub:
|
||||||
|
|
||||||
|
subi r6,r1,56 # r6 --> gprData
|
||||||
|
subi r7,r1,160 # r7 --> fprData
|
||||||
|
- addi r5,r1,112 # r5 --> extra stack args
|
||||||
|
+ addi r5,r1,STACK_PARAMS # r5 --> extra stack args
|
||||||
|
|
||||||
|
std r0, 16(r1)
|
||||||
|
|
||||||
|
@@ -75,7 +97,11 @@ SharedStub:
|
||||||
|
mtlr r0
|
||||||
|
blr
|
||||||
|
|
||||||
|
+#if _CALL_ELF == 2
|
||||||
|
+ .size SharedStub,.-SharedStub
|
||||||
|
+#else
|
||||||
|
.size SharedStub,.-.SharedStub
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
# Magic indicating no need for an executable stack
|
||||||
|
.section .note.GNU-stack, "", @progbits ; .previous
|
||||||
|
Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
|
||||||
|
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
|
||||||
|
@@ -83,7 +83,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
|
||||||
|
dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles
|
||||||
|
else {
|
||||||
|
float *p = (float *)ap;
|
||||||
|
+#ifndef __LITTLE_ENDIAN__
|
||||||
|
p++;
|
||||||
|
+#endif
|
||||||
|
dp->val.f = *p;
|
||||||
|
}
|
||||||
|
} else { /* integer type or pointer */
|
||||||
|
@@ -153,6 +155,43 @@ PrepareAndDispatch(nsXPTCStubBase* self,
|
||||||
|
// etc.
|
||||||
|
// Use assembler directives to get the names right...
|
||||||
|
|
||||||
|
+#if _CALL_ELF == 2
|
||||||
|
+# define STUB_ENTRY(n) \
|
||||||
|
+__asm__ ( \
|
||||||
|
+ ".section \".text\" \n\t" \
|
||||||
|
+ ".align 2 \n\t" \
|
||||||
|
+ ".if "#n" < 10 \n\t" \
|
||||||
|
+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
|
||||||
|
+ ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \
|
||||||
|
+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \
|
||||||
|
+ "0: addis 2,12,.TOC.-0b@ha \n\t" \
|
||||||
|
+ "addi 2,2,.TOC.-0b@l \n\t" \
|
||||||
|
+ ".localentry _ZN14nsXPTCStubBase5Stub"#n"Ev,.-_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \
|
||||||
|
+ \
|
||||||
|
+ ".elseif "#n" < 100 \n\t" \
|
||||||
|
+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \
|
||||||
|
+ ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \
|
||||||
|
+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \
|
||||||
|
+ "0: addis 2,12,.TOC.-0b@ha \n\t" \
|
||||||
|
+ "addi 2,2,.TOC.-0b@l \n\t" \
|
||||||
|
+ ".localentry _ZN14nsXPTCStubBase6Stub"#n"Ev,.-_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \
|
||||||
|
+ \
|
||||||
|
+ ".elseif "#n" < 1000 \n\t" \
|
||||||
|
+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \
|
||||||
|
+ ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \
|
||||||
|
+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \
|
||||||
|
+ "0: addis 2,12,.TOC.-0b@ha \n\t" \
|
||||||
|
+ "addi 2,2,.TOC.-0b@l \n\t" \
|
||||||
|
+ ".localentry _ZN14nsXPTCStubBase7Stub"#n"Ev,.-_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \
|
||||||
|
+ \
|
||||||
|
+ ".else \n\t" \
|
||||||
|
+ ".err \"stub number "#n" >= 1000 not yet supported\"\n" \
|
||||||
|
+ ".endif \n\t" \
|
||||||
|
+ \
|
||||||
|
+ "li 11,"#n" \n\t" \
|
||||||
|
+ "b SharedStub \n" \
|
||||||
|
+);
|
||||||
|
+#else
|
||||||
|
# define STUB_ENTRY(n) \
|
||||||
|
__asm__ ( \
|
||||||
|
".section \".toc\",\"aw\" \n\t" \
|
||||||
|
@@ -195,6 +234,7 @@ __asm__ (
|
||||||
|
"li 11,"#n" \n\t" \
|
||||||
|
"b SharedStub \n" \
|
||||||
|
);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#define SENTINEL_ENTRY(n) \
|
||||||
|
nsresult nsXPTCStubBase::Sentinel##n() \
|
||||||
Loading…
Reference in New Issue
Block a user