summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-08-06 18:22:48 +0200
committerRemi Collet <fedora@famillecollet.com>2012-08-06 18:22:48 +0200
commitae594094606ae28490c52bde58690c795d17d08e (patch)
tree66e777539d4adb578213e0e1d6b046aa2ce4a9a2
parent8e844366eada699023ca4c925438cd04824becbe (diff)
sync with rawhide (no build)
-rw-r--r--mozilla-750620.patch33
-rw-r--r--xulrunner.spec10
2 files changed, 42 insertions, 1 deletions
diff --git a/mozilla-750620.patch b/mozilla-750620.patch
new file mode 100644
index 0000000..c8c6d10
--- /dev/null
+++ b/mozilla-750620.patch
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1337607752 -7200
+# Node ID 93093285af6065c441a806e97ca8f79225a158c6
+# Parent 87c452c6444eecd226a30458e735d0cfaad714fd
+Bug 750620 - Declare double conversion correctness for more architectures
+
+diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
+--- a/mfbt/double-conversion/utils.h
++++ b/mfbt/double-conversion/utils.h
+@@ -48,17 +48,21 @@
+ // An easy way to test if the floating-point operations are correct is to
+ // evaluate: 89255.0/1e22. If the floating-point stack is 64 bits wide then
+ // the result is equal to 89255e-22.
+ // The best way to test this, is to create a division-function and to compare
+ // the output of the division with the expected result. (Inlining must be
+ // disabled.)
+ // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
+ #if defined(_M_X64) || defined(__x86_64__) || \
+- defined(__ARMEL__) || \
++ defined(__ARMEL__) || defined(__avr32__) || \
++ defined(__hppa__) || defined(__ia64__) || \
++ defined(__mips__) || defined(__powerpc__) || \
++ defined(__sparc__) || defined(__s390__) || \
++ defined(__SH4__) || defined(__alpha__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
+ // Windows uses a 64bit wide floating point stack.
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #else
+ #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
diff --git a/xulrunner.spec b/xulrunner.spec
index 7c09a85..a97da27 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -106,6 +106,7 @@ Patch24: crashreporter-remove-static.patch
# Upstream patches
Patch47: mozilla-691898.patch
Patch49: mozilla-746112.patch
+Patch50: mozilla-750620.patch
# ---------------------------------------------------
@@ -267,6 +268,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
%ifarch ppc ppc64
%patch49 -p2 -b .746112
%endif
+%patch50 -p1 -b .750620
%{__rm} -f .mozconfig
%{__cat} %{SOURCE10} \
@@ -553,10 +555,16 @@ fi
#---------------------------------------------------------------------
%changelog
+* Wed Jul 25 2012 Dan HorĂ¡k <dan[at]danny.cz> - 14.0.1-5
+- Added fix for secondary arches - mozbz#750620
+
* Tue Jul 24 2012 Remi Collet <RPMS@FamilleCollet.com> - 14.0.1-1
- Sync with rawhide, update to 14.0.1
-* Mon Jul 16 2012 Jan Horak <jhorak@redhat.com> - 14.0.1-1
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 14.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jul 16 2012 Martin Stransky <stransky@redhat.com> - 14.0.1-3
- Update to 14.0.1
* Sun Jun 16 2012 Remi Collet <RPMS@FamilleCollet.com> - 13.0.1-1