From ffa829deb4c197734e1ec7b08a702f9a567dd71b Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 23 May 2014 18:09:36 +0200 Subject: [PATCH] Added a build fix for ppc64 - rhbz#1100495 --- mozilla-973977.patch | 31 +++++++++++++++++++++++++++++++ thunderbird.spec | 10 +++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 mozilla-973977.patch diff --git a/mozilla-973977.patch b/mozilla-973977.patch new file mode 100644 index 0000000..d8ec932 --- /dev/null +++ b/mozilla-973977.patch @@ -0,0 +1,31 @@ +# HG changeset patch +# Parent c2172c2aaa693e00c989f76c83b83a2be97afaab +# User Ulrich Weigand +Bug 973977 - Mark SharedStub hidden to fix ppc64 build failure + + +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 ++++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s +@@ -15,16 +15,21 @@ + .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 f30,30; .set f31,31 + + .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 + + SharedStub: + .quad .SharedStub,.TOC.@tocbase + .previous + .type SharedStub,@function + diff --git a/thunderbird.spec b/thunderbird.spec index 9ba3192..48d1781 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -54,7 +54,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 24.5.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -81,6 +81,8 @@ Patch200: thunderbird-8.0-enable-addons.patch # PPC fixes Patch300: xulrunner-24.0-jemalloc-ppc.patch Patch301: mozilla-ppc64le.patch +Patch304: mozilla-973977.patch + # Fedora specific patches Patch400: rhbz-966424.patch Patch401: revert-removal-of-native-notifications.patch @@ -174,6 +176,9 @@ cd .. %if 0%{?fedora} > 20 %patch301 -p1 -b .ppc64le %endif +%ifarch ppc64 +%patch304 -p1 -b .973977 +%endif %if %{official_branding} # Required by Mozilla Corporation @@ -442,6 +447,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Fri May 23 2014 Martin Stransky - 24.5.0-4 +- Added a build fix for ppc64 - rhbz#1100495 + * Mon May 5 2014 Jan Horak - 24.5.0-3 - Fixed find requires