summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox.spec9
-rw-r--r--mozilla-973977.patch31
2 files changed, 39 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec
index cf2e21e..c13123a 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -87,7 +87,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 29.0.1
-Release: 4%{?pre_tag}%{?dist}
+Release: 5%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -124,6 +124,7 @@ Patch301: firefox-aarch64-double-convertsion.patch
Patch302: firefox-aarch64-libevent.patch
# mbo 963024
Patch303: firefox-aarch64-xpcom.patch
+Patch304: mozilla-973977.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -244,6 +245,9 @@ cd %{tarballdir}
%patch301 -p1 -b .aarch64-dbl
%patch302 -p1 -b .aarch64-libevent
%patch303 -p1 -b .aarch64-xpcom
+%ifarch ppc64
+%patch304 -p1 -b .973977
+%endif
%if %{official_branding}
# Required by Mozilla Corporation
@@ -647,6 +651,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Tue May 23 2014 Martin Stransky <stransky@redhat.com> - 29.0.1-5
+- Added a build fix for ppc64 - rhbz#1100495
+
* Tue May 20 2014 Martin Stransky <stransky@redhat.com> - 29.0.1-4
- Enabled necko-wifi
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 <uweigand@de.ibm.com>
+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
+
bgstack15