[SVN-Commit] r1104 - in trunk/www: firefox-nightly/files firefox/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Mon Nov 26 05:13:11 2012
New Revision: 1104

Log:
one more ugly workaround for gcc42

Added:
   trunk/www/firefox-nightly/files/patch-bug815025
   trunk/www/firefox/files/patch-bug815025

Added: trunk/www/firefox-nightly/files/patch-bug815025
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug815025	Mon Nov 26 05:13:11 2012	(r1104)
@@ -0,0 +1,27 @@
+--- mfbt/SHA1.h~
++++ mfbt/SHA1.h
+@@ -13,6 +13,11 @@
+ 
+ #include <stddef.h>
+ 
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++/* c++/36107: mark SHA1Sum constructor as weak manually */
++__asm__(".weak _ZN7mozilla7SHA1SumC1Ev");
++#endif
++
+ namespace mozilla {
+ 
+ /**
+@@ -44,7 +49,12 @@ class SHA1Sum
+     bool mDone;
+ 
+   public:
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++    /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
++    MOZ_IMPORT_API SHA1Sum();
++#else
+     MFBT_API SHA1Sum();
++#endif
+ 
+     static const size_t HashSize = 20;
+     typedef uint8_t Hash[HashSize];

Added: trunk/www/firefox/files/patch-bug815025
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug815025	Mon Nov 26 05:13:11 2012	(r1104)
@@ -0,0 +1,27 @@
+--- mfbt/SHA1.h~
++++ mfbt/SHA1.h
+@@ -27,6 +27,11 @@
+ #include "mozilla/StandardInteger.h"
+ #include "mozilla/Types.h"
+ 
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++/* c++/36107: mark SHA1Sum constructor as weak manually */
++__asm__(".weak _ZN7mozilla7SHA1SumC1Ev");
++#endif
++
+ namespace mozilla {
+ class SHA1Sum {
+   union {
+@@ -39,7 +43,12 @@ class SHA1Sum {
+ 
+ public:
+   static const unsigned int HashSize = 20;
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++  /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
++  MOZ_IMPORT_API() SHA1Sum();
++#else
+   MFBT_API() SHA1Sum();
++#endif
+   MFBT_API(void) update(const void* dataIn, uint32_t len);
+   MFBT_API(void) finish(uint8_t hashout[20]);
+ };